zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: electricPotential: replace operandField with getOrReadField

Browse Source
This commit is contained in:
Kutalmis Bercin
2023-01-11 11:48:39 +00:00
committed by Kutalmış Berçin
parent d92583f4b6
commit 7269cc1d3b
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/functionObjects/solvers/electricPotential/electricPotential.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2021 OpenCFD Ltd.
Copyright (C) 2021-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -44,16 +44,20 @@ namespace functionObjects
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
Foam::volScalarField&
Foam::functionObjects::electricPotential::operandField()
Foam::volScalarField& Foam::functionObjects::electricPotential::getOrReadField
(
const word& fieldName
) const
{
if (!foundObject<volScalarField>(fieldName_))
auto* ptr = mesh_.getObjectPtr<volScalarField>(fieldName);
if (!ptr)
{
auto tfldPtr = tmp<volScalarField>::New
ptr = new volScalarField
(
IOobject
(
fieldName_,
fieldName,
mesh_.time().timeName(),
mesh_,
IOobject::MUST_READ,
@ -62,10 +66,10 @@ Foam::functionObjects::electricPotential::operandField()
),
mesh_
);
store(fieldName_, tfldPtr);
mesh_.objectRegistry::store(ptr);
}
return lookupObjectRef<volScalarField>(fieldName_);
return *ptr;
}
@ -212,7 +216,7 @@ Foam::functionObjects::electricPotential::electricPotential
// Force creation of transported field so any BCs using it can
// look it up
volScalarField& eV = operandField();
volScalarField& eV = getOrReadField(fieldName_);
eV.correctBoundaryConditions();
}
@ -316,7 +320,7 @@ bool Foam::functionObjects::electricPotential::execute()
tmp<volScalarField> tsigma = this->sigma();
const volScalarField& sigma = tsigma();
volScalarField& eV = operandField();
volScalarField& eV = getOrReadField(fieldName_);
for (label i = 1; i <= nCorr_; ++i)
{
@ -342,7 +346,7 @@ bool Foam::functionObjects::electricPotential::write()
<< tab << fieldName_
<< endl;
volScalarField& eV = operandField();
volScalarField& eV = getOrReadField(fieldName_);
if (writeDerivedFields_)
{

8
src/functionObjects/solvers/electricPotential/electricPotential.H
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2021 OpenCFD Ltd.
Copyright (C) 2021-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -212,8 +212,10 @@ class electricPotential
// Private Member Functions
//- Return reference to the registered operand field
volScalarField& operandField();
//- Return requested field from the object registry
//- or read+register the field to the object registry
volScalarField& getOrReadField(const word& fieldName) const;
//- Return the isotropic electrical conductivity field of the mixture
tmp<volScalarField> sigma() const;