songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STYLE: Refactoring use of meshState in {fv|faMesh}

Browse Source 
{fv|fa}Mesh classes inherited the [old] data class (renamed meshState)
- meshState removed from inheritance list and added as data members
This commit is contained in:
Andrew Heather 2023-11-28 11:10:59 +00:00
parent da20ff2666
commit 79cd147de0
25 changed files with 67 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/solveFluid.H
View File

@ -1,6 +1,6 @@
if (finalIter)
{
mesh.data::add("finalIteration", true);
mesh.data().add("finalIteration", true);
}
if (frozenFlow)
@ -35,5 +35,5 @@ else
if (finalIter)
{
mesh.data::remove("finalIteration");
mesh.data().remove("finalIteration");
}

4
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid/solveSolid.H
View File

@ -1,6 +1,6 @@
if (finalIter)
{
mesh.data::add("finalIteration", true);
mesh.data().add("finalIteration", true);
}
{
@ -35,5 +35,5 @@ if (finalIter)
if (finalIter)
{
mesh.data::remove("finalIteration");
mesh.data().remove("finalIteration");
}

4
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
View File

@ -1,6 +1,6 @@
if (finalIter)
{
mesh.data::add("finalIteration", true);
mesh.data().add("finalIteration", true);
}
if (frozenFlow)
@ -36,5 +36,5 @@ else
if (finalIter)
{
mesh.data::remove("finalIteration");
mesh.data().remove("finalIteration");
}

4
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
View File

@ -25,7 +25,7 @@
if (finalIter)
{
mesh.data::add("finalIteration", true);
mesh.data().add("finalIteration", true);
}
hEqn.solve(mesh.solver(h.select(finalIter)));
@ -39,7 +39,7 @@
if (finalIter)
{
mesh.data::remove("finalIteration");
mesh.data().remove("finalIteration");
}
}
}

4
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
View File

@ -31,7 +31,7 @@ License
#include "demandDrivenData.H"
#include "dictionary.H"
#include "localIOdictionary.H"
#include "data.H"
#include "meshState.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -1155,7 +1155,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::relax()
if
(
this->mesh().data::template getOrDefault<bool>
this->mesh().data().template getOrDefault<bool>
(
"finalIteration",
false

3
src/OpenFOAM/meshes/polyMesh/polyMesh.C
View File

@ -173,6 +173,7 @@ Foam::polyMesh::polyMesh(const IOobject& io, const bool doInit)
:
objectRegistry(io),
primitiveMesh(),
data_(static_cast<const objectRegistry&>(*this)),
points_
(
IOobject
@ -380,6 +381,7 @@ Foam::polyMesh::polyMesh
:
objectRegistry(io),
primitiveMesh(),
data_(static_cast<const objectRegistry&>(*this)),
points_
(
IOobject
@ -533,6 +535,7 @@ Foam::polyMesh::polyMesh
:
objectRegistry(io),
primitiveMesh(),
data_(static_cast<const objectRegistry&>(*this)),
points_
(
IOobject

11
src/OpenFOAM/meshes/polyMesh/polyMesh.H
View File

@ -58,6 +58,7 @@ SourceFiles
#include "pointZoneMesh.H"
#include "faceZoneMesh.H"
#include "cellZoneMesh.H"
#include "meshState.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -117,6 +118,9 @@ private:
// Primitive mesh data
//- Mesh data
meshState data_;
//- Points
pointIOField points_;
@ -304,6 +308,7 @@ private:
labelHashSet* setPtr
) const;
public:
// Public Typedefs
@ -429,6 +434,12 @@ public:
// Access
//- Return a reference to the mesh data
virtual meshState& data() noexcept {return data_;}
//- Return a const reference to the mesh data
virtual const meshState& data() const noexcept {return data_;}
//- Return raw points
virtual const pointField& points() const;

2
src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
View File

@ -452,6 +452,7 @@ Foam::polyMesh::polyMesh
:
objectRegistry(io),
primitiveMesh(),
data_(static_cast<const objectRegistry&>(*this)),
points_
(
IOobject
@ -733,6 +734,7 @@ Foam::polyMesh::polyMesh
:
objectRegistry(io),
primitiveMesh(),
data_(static_cast<const objectRegistry&>(*this)),
points_
(
IOobject

2
src/finiteArea/faMatrices/faMatrix/faMatrixSolve.C
View File

@ -162,7 +162,7 @@ Foam::SolverPerformance<Type> Foam::faMatrix<Type>::solve
psi.correctBoundaryConditions();
psi.mesh().setSolverPerformance(psi.name(), solverPerfVec);
psi.mesh().data().setSolverPerformance(psi.name(), solverPerfVec);
return solverPerfVec;
}

2
src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
View File

@ -96,7 +96,7 @@ Foam::solverPerformance Foam::faMatrix<Foam::scalar>::solve
psi.correctBoundaryConditions();
psi.mesh().setSolverPerformance(psi.name(), solverPerf);
psi.mesh().data().setSolverPerformance(psi.name(), solverPerf);
return solverPerf;
}

7
src/finiteArea/faMesh/faMesh.C
View File

@ -345,7 +345,6 @@ Foam::faMesh::faMesh
faSchemes(mesh()),
edgeInterpolation(*this),
faSolution(mesh()),
data(faMesh::thisDb()), // Always NO_READ, NO_WRITE
faceLabels_
(
IOobject
@ -468,7 +467,6 @@ Foam::faMesh::faMesh
faSchemes(mesh(), io.readOpt()),
edgeInterpolation(*this),
faSolution(mesh(), io.readOpt()),
data(faMesh::thisDb()), // Always NO_READ, NO_WRITE
faceLabels_
(
IOobject
@ -551,11 +549,6 @@ Foam::faMesh::faMesh
mesh(),
static_cast<const faSolution&>(baseMesh)
),
data
(
faMesh::thisDb(),
static_cast<const data&>(baseMesh)
),
faceLabels_
(
IOobject

8
src/finiteArea/faMesh/faMesh.H
View File

@ -73,7 +73,6 @@ Author
#include "faGlobalMeshData.H"
#include "faSchemes.H"
#include "faSolution.H"
#include "data.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -96,8 +95,7 @@ class faMesh
public lduMesh,
public faSchemes,
public edgeInterpolation, // may need input from faSchemes
public faSolution,
public data
public faSolution
{
// Private (internal) classes/structures
@ -647,6 +645,10 @@ public:
//- Return the current instance directory for faces
const fileName& facesInstance() const;
const meshState& data() const noexcept { return mesh().data(); }
meshState& data() noexcept { return const_cast<polyMesh&>(mesh()).data(); }
// Parallel

3
src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.C
View File

@ -112,7 +112,8 @@ bool Foam::loopControl::checkConverged() const
if (!meshPtr) continue;
const fvMesh& regionMesh = *meshPtr;
const dictionary& solverDict = regionMesh.solverPerformanceDict();
const dictionary& solverDict =
regionMesh.data().solverPerformanceDict();
for (const entry& dataDictEntry : solverDict)
{
const word& variableName = dataDictEntry.keyword();

10
src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
View File

@ -72,7 +72,7 @@ bool Foam::pimpleControl::criteriaSatisfied()
bool achieved = true;
bool checked = false; // safety that some checks were indeed performed
const dictionary& solverDict = mesh_.solverPerformanceDict();
const dictionary& solverDict = mesh_.data().solverPerformanceDict();
for (const entry& solverPerfDictEntry : solverDict)
{
const word& fieldName = solverPerfDictEntry.keyword();
@ -219,7 +219,7 @@ bool Foam::pimpleControl::loop()
}
corr_ = 0;
mesh_.data::remove("finalIteration");
mesh_.data().remove("finalIteration");
return false;
}
@ -231,7 +231,7 @@ bool Foam::pimpleControl::loop()
Info<< algorithmName_ << ": converged in " << corr_ - 1
<< " iterations" << endl;
mesh_.data::remove("finalIteration");
mesh_.data().remove("finalIteration");
corr_ = 0;
converged_ = false;
@ -242,7 +242,7 @@ bool Foam::pimpleControl::loop()
Info<< algorithmName_ << ": iteration " << corr_ << endl;
storePrevIterFields();
mesh_.data::add("finalIteration", true);
mesh_.data().add("finalIteration", true);
converged_ = true;
}
}
@ -250,7 +250,7 @@ bool Foam::pimpleControl::loop()
{
if (finalIter())
{
mesh_.data::add("finalIteration", true);
mesh_.data().add("finalIteration", true);
}
if (corr_ <= nCorrPIMPLE_)

2
src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
View File

@ -56,7 +56,7 @@ bool Foam::simpleControl::criteriaSatisfied()
bool achieved = true;
bool checked = false; // safety that some checks were indeed performed
const dictionary& solverDict = mesh_.solverPerformanceDict();
const dictionary& solverDict = mesh_.data().solverPerformanceDict();
for (const entry& solverPerfDictEntry : solverDict)
{
const word& fieldName = solverPerfDictEntry.keyword();

4
src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
View File

@ -193,12 +193,12 @@ void Foam::solutionControl::setFirstIterFlag
if (force || (check && corr_ <= 1 && corrNonOrtho_ == 0))
{
DebugInfo<< "solutionControl: set firstIteration flag" << endl;
mesh_.data::set("firstIteration", true);
mesh_.data().set("firstIteration", true);
}
else
{
DebugInfo<< "solutionControl: remove firstIteration flag" << endl;
mesh_.data::remove("firstIteration");
mesh_.data().remove("firstIteration");
}
}

2
src/finiteVolume/functionObjects/fieldSelections/solverFieldSelection/solverFieldSelection.C
View File

@ -59,7 +59,7 @@ bool Foam::functionObjects::solverFieldSelection::updateSelection()
const fvMesh& mesh = static_cast<const fvMesh&>(obr_);
const dictionary& solverDict = mesh.solverPerformanceDict();
const dictionary& solverDict = mesh.data().solverPerformanceDict();
const wordList solvedFieldNames(solverDict.sortedToc());

4
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
View File

@ -1257,7 +1257,7 @@ void Foam::fvMatrix<Type>::relax()
{
word name = psi_.select
(
psi_.mesh().data::template getOrDefault<bool>
psi_.mesh().data().template getOrDefault<bool>
("finalIteration", false)
);
@ -1534,7 +1534,7 @@ const Foam::dictionary& Foam::fvMatrix<Type>::solverDict() const
(
psi_.select
(
psi_.mesh().data::template getOrDefault<bool>
psi_.mesh().data().template getOrDefault<bool>
("finalIteration", false)
)
);

4
src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
View File

@ -241,7 +241,7 @@ Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solveSegregated
psi.correctBoundaryConditions();
psi.mesh().setSolverPerformance(psi.name(), solverPerfVec);
psi.mesh().data().setSolverPerformance(psi.name(), solverPerfVec);
return solverPerfVec;
}
@ -308,7 +308,7 @@ Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solveCoupled
psi.correctBoundaryConditions();
psi.mesh().setSolverPerformance(psi.name(), solverPerf);
psi.mesh().data().setSolverPerformance(psi.name(), solverPerf);
return solverPerf;
}

8
src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
View File

@ -155,7 +155,7 @@ Foam::solverPerformance Foam::fvMatrix<Foam::scalar>::fvSolver::solve
psi.correctBoundaryConditions();
psi.mesh().setSolverPerformance(psi.name(), solverPerf);
psi.mesh().data().setSolverPerformance(psi.name(), solverPerf);
return solverPerf;
}
@ -317,7 +317,11 @@ Foam::solverPerformance Foam::fvMatrix<Foam::scalar>::solveSegregated
);
localPsi.correctBoundaryConditions();
localPsi.mesh().setSolverPerformance(localPsi.name(), solverPerf);
localPsi.mesh().data().setSolverPerformance
(
localPsi.name(),
solverPerf
);
}
return solverPerf;

19
src/finiteVolume/fvMesh/fvMesh.C
View File

@ -246,7 +246,6 @@ Foam::fvMesh::fvMesh(const IOobject& io, const bool doInit)
fvSchemes(static_cast<const objectRegistry&>(*this)),
surfaceInterpolation(*this),
fvSolution(static_cast<const objectRegistry&>(*this)),
data(static_cast<const objectRegistry&>(*this)),
boundary_(*this, boundaryMesh()),
lduPtr_(nullptr),
curTimeIndex_(time().timeIndex()),
@ -384,7 +383,6 @@ Foam::fvMesh::fvMesh
fvSchemes(static_cast<const objectRegistry&>(*this)),
surfaceInterpolation(*this),
fvSolution(static_cast<const objectRegistry&>(*this)),
data(static_cast<const objectRegistry&>(*this)),
boundary_(*this),
lduPtr_(nullptr),
curTimeIndex_(time().timeIndex()),
@ -421,7 +419,6 @@ Foam::fvMesh::fvMesh
fvSchemes(static_cast<const objectRegistry&>(*this)),
surfaceInterpolation(*this),
fvSolution(static_cast<const objectRegistry&>(*this)),
data(static_cast<const objectRegistry&>(*this)),
boundary_(*this),
lduPtr_(nullptr),
curTimeIndex_(time().timeIndex()),
@ -496,11 +493,6 @@ Foam::fvMesh::fvMesh
static_cast<const objectRegistry&>(*this),
static_cast<const fvSolution&>(baseMesh)
),
data
(
static_cast<const objectRegistry&>(*this),
static_cast<const data&>(baseMesh)
),
boundary_(*this),
lduPtr_(nullptr),
curTimeIndex_(time().timeIndex()),
@ -514,6 +506,9 @@ Foam::fvMesh::fvMesh
phiPtr_(nullptr)
{
DebugInFunction << "Constructing fvMesh as copy and primitives" << endl;
// Reset mesh data
data().reset(baseMesh.data());
}
@ -546,11 +541,6 @@ Foam::fvMesh::fvMesh
static_cast<const objectRegistry&>(*this),
static_cast<const fvSolution&>(baseMesh)
),
data
(
static_cast<const objectRegistry&>(*this),
static_cast<const data&>(baseMesh)
),
boundary_(*this),
lduPtr_(nullptr),
curTimeIndex_(time().timeIndex()),
@ -564,6 +554,9 @@ Foam::fvMesh::fvMesh
phiPtr_(nullptr)
{
DebugInFunction << "Constructing fvMesh as copy and primitives" << endl;
// Reset mesh data
data().reset(baseMesh.data());
}

4
src/finiteVolume/fvMesh/fvMesh.H
View File

@ -57,7 +57,6 @@ SourceFiles
#include "surfaceInterpolation.H"
#include "fvSchemes.H"
#include "fvSolution.H"
#include "data.H"
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
#include "pointFieldsFwd.H"
@ -87,8 +86,7 @@ class fvMesh
public lduMesh,
public fvSchemes,
public surfaceInterpolation, // needs input from fvSchemes
public fvSolution,
public data
public fvSolution
{
protected:

2
src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
View File

@ -125,7 +125,7 @@ equationInitialResidualCondition::apply()
}
const fvMesh& mesh = refCast<const fvMesh>(obr_);
const dictionary& solverDict = mesh.solverPerformanceDict();
const dictionary& solverDict = mesh.data().solverPerformanceDict();
const auto& selection = fieldSelection_.selection();
List<scalar> result(selection.size(), -VGREAT);

2
src/functionObjects/utilities/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.C
View File

@ -97,7 +97,7 @@ bool Foam::functionObjects::runTimeControls::equationMaxIterCondition::apply()
}
const fvMesh& mesh = refCast<const fvMesh>(obr_);
const dictionary& solverDict = mesh.solverPerformanceDict();
const dictionary& solverDict = mesh.data().solverPerformanceDict();
List<label> result(fieldNames_.size(), -1);

6
src/functionObjects/utilities/solverInfo/solverInfoTemplates.C
View File

@ -79,7 +79,8 @@ void Foam::functionObjects::solverInfo::initialiseResidualField
if (foundObject<volFieldType>(fieldName))
{
const Foam::dictionary& solverDict = mesh_.solverPerformanceDict();
const Foam::dictionary& solverDict =
mesh_.data().solverPerformanceDict();
if (solverDict.found(fieldName))
{
@ -113,7 +114,8 @@ void Foam::functionObjects::solverInfo::updateSolverInfo(const word& fieldName)
if (foundObject<volFieldType>(fieldName))
{
const Foam::dictionary& solverDict = mesh_.solverPerformanceDict();
const Foam::dictionary& solverDict =
mesh_.data().solverPerformanceDict();
if (solverDict.found(fieldName))
{