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

STYLE: use explicit REGISTER option when storing fields

Browse Source
This commit is contained in:
Mark Olesen
2023-04-24 12:05:55 +02:00
parent d9533e561b
commit ee39e3d276
37 changed files with 239 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C
View File

@ -302,8 +302,9 @@ Foam::label Foam::parLagrangianDistributor::readFields
objectName, objectName,
cloud.time().timeName(), cloud.time().timeName(),
cloud, cloud,
IOobject::READ_IF_PRESENT, IOobject::LAZY_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
label(0) label(0)
); );

4
src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
View File

@ -103,7 +103,7 @@ Foam::codedBase::codeDict
const word& dictName const word& dictName
) )
{ {
IOdictionary* dictptr = obr.getObjectPtr<IOdictionary>(dictName); auto* dictptr = obr.getObjectPtr<IOdictionary>(dictName);
if (!dictptr) if (!dictptr)
{ {
@ -114,7 +114,7 @@ Foam::codedBase::codeDict
dictName, dictName,
obr.time().system(), obr.time().system(),
obr, obr,
IOobject::MUST_READ_IF_MODIFIED, IOobject::READ_MODIFIED,
IOobject::NO_WRITE, IOobject::NO_WRITE,
IOobject::REGISTER IOobject::REGISTER
) )

22
src/OpenFOAM/fields/cloud/cloudTemplates.C
View File

@ -37,20 +37,18 @@ Foam::IOField<Type>& Foam::cloud::createIOField
objectRegistry& obr objectRegistry& obr
) )
{ {
IOField<Type>* fieldPtr IOField<Type>* fieldPtr = new IOField<Type>
( (
new IOField<Type> IOobject
( (
IOobject fieldName,
( obr.time().timeName(),
fieldName, obr,
obr.time().timeName(), IOobject::NO_READ,
obr, IOobject::AUTO_WRITE,
IOobject::NO_READ, IOobject::REGISTER
IOobject::AUTO_WRITE ),
), nParticle
nParticle
)
); );
fieldPtr->store(); fieldPtr->store();

9
src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
View File

@ -297,13 +297,14 @@ class DEShybrid
const word factorName(IOobject::scopedName(typeName, "Factor")); const word factorName(IOobject::scopedName(typeName, "Factor"));
const fvMesh& mesh = this->mesh(); const fvMesh& mesh = this->mesh();
const IOobject factorIO IOobject factorIO
( (
factorName, factorName,
mesh.time().timeName(), mesh.time().timeName(),
mesh, mesh,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
); );
if (blendedSchemeBaseName::debug) if (blendedSchemeBaseName::debug)
@ -335,7 +336,9 @@ class DEShybrid
} }
else else
{ {
const volScalarField factor factorIO.registerObject(IOobjectOption::NO_REGISTER);
volScalarField factor
( (
factorIO, factorIO,
max(sigmaMax_*tanh(pow(A, CH1_)), sigmaMin_) max(sigmaMax_*tanh(pow(A, CH1_)), sigmaMin_)

3
src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
View File

@ -80,7 +80,10 @@ bool Foam::functionObjects::ObukhovLength::calcOL()
); );
result1->store(); result1->store();
}
if (!result2)
{
result2 = new volScalarField result2 = new volScalarField
( (
IOobject IOobject

3
src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
View File

@ -60,7 +60,8 @@ Foam::volScalarField& Foam::fv::atmPlantCanopyTurbSource::getOrReadField
mesh_.time().timeName(), mesh_.time().timeName(),
mesh_, mesh_,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE,
IOobject::REGISTER
), ),
mesh_ mesh_
); );

3
src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C
View File

@ -61,7 +61,8 @@ Foam::volScalarField& Foam::fv::atmPlantCanopyUSource::getOrReadField
mesh_.time().timeName(), mesh_.time().timeName(),
mesh_, mesh_,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE,
IOobject::REGISTER
), ),
mesh_ mesh_
); );

18
src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
View File

@ -83,24 +83,20 @@ void Foam::polyMeshFilter::copySets
{ {
const SetType& set = *iter(); const SetType& set = *iter();
SetType* origSet = auto* setPtr =
newMesh.objectRegistry::getObjectPtr<SetType>(set.name()); newMesh.objectRegistry::getObjectPtr<SetType>(set.name());
if (origSet) if (setPtr)
{ {
(*origSet) = set; (*setPtr) = set;
(*origSet).sync(newMesh);
} }
else else
{ {
SetType* newSet setPtr = new SetType(newMesh, set.name(), set, set.writeOpt());
( setPtr->store();
new SetType(newMesh, set.name(), set, set.writeOpt())
);
newSet->store();
newSet->sync(newMesh);
} }
setPtr->sync(newMesh);
} }
} }

5
src/functionObjects/field/columnAverage/columnAverageTemplates.C
View File

@ -47,7 +47,7 @@ bool Foam::functionObjects::columnAverage::columnAverageField
const word resultName(averageName(fieldName)); const word resultName(averageName(fieldName));
fieldType* resPtr = obr_.getObjectPtr<fieldType>(resultName); auto* resPtr = obr_.getObjectPtr<fieldType>(resultName);
if (!resPtr) if (!resPtr)
{ {
@ -59,7 +59,8 @@ bool Foam::functionObjects::columnAverage::columnAverageField
fld.mesh().time().timeName(), fld.mesh().time().timeName(),
fld.mesh(), fld.mesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
fld fld
); );

3
src/functionObjects/field/histogram/histogramModels/histogramModel/histogramModel.C
View File

@ -68,7 +68,8 @@ Foam::volScalarField& Foam::histogramModel::getOrReadField
mesh_.time().timeName(), mesh_.time().timeName(),
mesh_, mesh_,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE,
IOobject::REGISTER
), ),
mesh_ mesh_
); );

34
src/functionObjects/field/mapFields/mapFieldsTemplates.C
View File

@ -129,28 +129,28 @@ bool Foam::functionObjects::mapFields::mapFieldType() const
const VolFieldType& field = lookupObject<VolFieldType>(fieldName); const VolFieldType& field = lookupObject<VolFieldType>(fieldName);
if (!mapRegion.foundObject<VolFieldType>(fieldName)) auto* mapFieldPtr = mapRegion.getObjectPtr<VolFieldType>(fieldName);
if (!mapFieldPtr)
{ {
VolFieldType* tmappedField = mapFieldPtr = new VolFieldType
new VolFieldType (
IOobject
( (
IOobject fieldName,
( time_.timeName(),
fieldName,
time_.timeName(),
mapRegion,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mapRegion, mapRegion,
dimensioned<Type>(field.dimensions(), Zero) IOobject::NO_READ,
); IOobject::NO_WRITE,
IOobject::REGISTER
),
mapRegion,
dimensioned<Type>(field.dimensions(), Zero)
);
tmappedField->store(); mapFieldPtr->store();
} }
auto& mappedField = *mapFieldPtr;
VolFieldType& mappedField =
mapRegion.template lookupObjectRef<VolFieldType>(fieldName);
mappedField = interpPtr_->mapTgtToSrc(field); mappedField = interpPtr_->mapTgtToSrc(field);

9
src/functionObjects/field/proudmanAcousticPower/proudmanAcousticPower.C
View File

@ -94,8 +94,7 @@ Foam::functionObjects::proudmanAcousticPower::a() const
( (
scopedName("a"), scopedName("a"),
mesh_.time().timeName(), mesh_.time().timeName(),
mesh_, mesh_
IOobject::NO_READ
), ),
mesh_, mesh_,
aRef_ aRef_
@ -170,7 +169,8 @@ Foam::functionObjects::proudmanAcousticPower::proudmanAcousticPower
mesh_.time().timeName(), mesh_.time().timeName(),
mesh_, mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
mesh_, mesh_,
dimensionedScalar(dimPower/dimVolume, Zero) dimensionedScalar(dimPower/dimVolume, Zero)
@ -189,7 +189,8 @@ Foam::functionObjects::proudmanAcousticPower::proudmanAcousticPower
mesh_.time().timeName(), mesh_.time().timeName(),
mesh_, mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
mesh_, mesh_,
dimensionedScalar(dimless, Zero) dimensionedScalar(dimless, Zero)

3
src/functionObjects/field/readFields/readFields.C
View File

@ -111,7 +111,8 @@ bool Foam::functionObjects::readFields::execute()
mesh_.time().timeName(), mesh_.time().timeName(),
mesh_, mesh_,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
); );
const bool ok = const bool ok =

5
src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C
View File

@ -99,8 +99,9 @@ bool Foam::resolutionIndexModel::read(const dictionary& dict)
resultName_, resultName_,
mesh_.time().timeName(), mesh_.time().timeName(),
mesh_, mesh_,
IOobject::READ_IF_PRESENT, IOobject::LAZY_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
mesh_, mesh_,
dimensionedScalar(dimless, Zero), dimensionedScalar(dimless, Zero),

3
src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModelTemplates.C
View File

@ -48,7 +48,8 @@ GeoFieldType& Foam::resolutionIndexModel::getOrReadField
mesh_.time().timeName(), mesh_.time().timeName(),
mesh_, mesh_,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE,
IOobject::REGISTER
), ),
mesh_ mesh_
); );

12
src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
View File

@ -67,7 +67,8 @@ Foam::functionObjects::stabilityBlendingFactor::indicator()
time_.timeName(), time_.timeName(),
mesh_, mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
mesh_, mesh_,
dimensionedScalar(dimless, Zero), dimensionedScalar(dimless, Zero),
@ -558,7 +559,8 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
mesh_.time().constant(), mesh_.time().constant(),
mesh_, mesh_,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
); );
if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false)) if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false))
@ -587,7 +589,8 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
mesh_.time().constant(), mesh_.time().constant(),
mesh_, mesh_,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
); );
if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false)) if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false))
@ -614,7 +617,8 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
mesh_.time().constant(), mesh_.time().constant(),
mesh_, mesh_,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
); );
if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false)) if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false))

24
src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
View File

@ -49,21 +49,21 @@ void Foam::functionObjects::turbulenceFields::processField
} }
else else
{ {
obr_.store fldPtr = new FieldType
( (
new FieldType IOobject
( (
IOobject localName,
( obr_.time().timeName(),
localName, obr_,
obr_.time().timeName(), IOobject::LAZY_READ,
obr_, IOobject::NO_WRITE,
IOobject::READ_IF_PRESENT, IOobject::REGISTER
IOobject::NO_WRITE ),
), tvalue
tvalue
)
); );
obr_.store(fldPtr);
} }
} }

6
src/functionObjects/forces/forceCoeffs/forceCoeffs.C
View File

@ -76,7 +76,8 @@ Foam::volVectorField& Foam::functionObjects::forceCoeffs::forceCoeff()
time_.timeName(), time_.timeName(),
mesh_, mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
mesh_, mesh_,
dimensionedVector(dimless, Zero) dimensionedVector(dimless, Zero)
@ -104,7 +105,8 @@ Foam::volVectorField& Foam::functionObjects::forceCoeffs::momentCoeff()
time_.timeName(), time_.timeName(),
mesh_, mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
mesh_, mesh_,
dimensionedVector(dimless, Zero) dimensionedVector(dimless, Zero)

6
src/functionObjects/forces/forces/forces.C
View File

@ -101,7 +101,8 @@ Foam::volVectorField& Foam::functionObjects::forces::force()
time_.timeName(), time_.timeName(),
mesh_, mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
mesh_, mesh_,
dimensionedVector(dimForce, Zero) dimensionedVector(dimForce, Zero)
@ -128,7 +129,8 @@ Foam::volVectorField& Foam::functionObjects::forces::moment()
time_.timeName(), time_.timeName(),
mesh_, mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
mesh_, mesh_,
dimensionedVector(dimForce*dimLength, Zero) dimensionedVector(dimForce*dimLength, Zero)

3
src/functionObjects/utilities/solverInfo/solverInfo.C
View File

@ -102,7 +102,8 @@ void Foam::functionObjects::solverInfo::createResidualField
mesh_.time().timeName(), mesh_.time().timeName(),
mesh_, mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
Field<scalar>(mesh_.nCells(), Zero) Field<scalar>(mesh_.nCells(), Zero)
); );

29
src/lagrangian/intermediate/submodels/CloudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.C
View File

@ -64,25 +64,28 @@ void Foam::HeatTransferCoeff<CloudType>::postEvolve
const auto& tc = const auto& tc =
static_cast<const ThermoCloud<KinematicCloud<Cloud<parcelType>>>&>(c); static_cast<const ThermoCloud<KinematicCloud<Cloud<parcelType>>>&>(c);
if (!c.template foundObject<IOField<scalar>>("htc")) auto* htcPtr = c.template getObjectPtr<IOField<scalar>>("htc");
if (!htcPtr)
{ {
auto* htcPtr = htcPtr = new IOField<scalar>
new IOField<scalar> (
IOobject
( (
IOobject "htc",
( c.time().timeName(),
"htc", c,
c.time().timeName(), IOobject::NO_READ,
c, IOobject::NO_WRITE,
IOobject::NO_READ IOobject::REGISTER
) )
); );
htcPtr->store(); htcPtr->store();
} }
auto& htc = *htcPtr;
auto& htc = c.template lookupObjectRef<IOField<scalar>>("htc"); htc.resize(c.size());
htc.setSize(c.size());
const auto& heatTransfer = tc.heatTransfer(); const auto& heatTransfer = tc.heatTransfer();
typename parcelType::trackingData& nctd = typename parcelType::trackingData& nctd =

29
src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.C
View File

@ -61,25 +61,28 @@ void Foam::KinematicReynoldsNumber<CloudType>::postEvolve
{ {
auto& c = this->owner(); auto& c = this->owner();
if (!c.template foundObject<IOField<scalar>>("Re")) auto* RePtr = c.template getObjectPtr<IOField<scalar>>("Re");
if (!RePtr)
{ {
auto* RePtr = RePtr = new IOField<scalar>
new IOField<scalar> (
IOobject
( (
IOobject "Re",
( c.time().timeName(),
"Re", c,
c.time().timeName(), IOobject::NO_READ,
c, IOobject::NO_WRITE,
IOobject::NO_READ IOobject::REGISTER
) )
); );
RePtr->store(); RePtr->store();
} }
auto& Re = *RePtr;
auto& Re = c.template lookupObjectRef<IOField<scalar>>("Re"); Re.resize(c.size());
Re.setSize(c.size());
label parceli = 0; label parceli = 0;
forAllConstIters(c, parcelIter) forAllConstIters(c, parcelIter)

29
src/lagrangian/intermediate/submodels/CloudFunctionObjects/NusseltNumber/NusseltNumber.C
View File

@ -64,25 +64,28 @@ void Foam::NusseltNumber<CloudType>::postEvolve
const auto& tc = const auto& tc =
static_cast<const ThermoCloud<KinematicCloud<Cloud<parcelType>>>&>(c); static_cast<const ThermoCloud<KinematicCloud<Cloud<parcelType>>>&>(c);
if (!c.template foundObject<IOField<scalar>>("Nu")) auto* NuPtr = c.template getObjectPtr<IOField<scalar>>("Nu");
if (!NuPtr)
{ {
auto* NuPtr = NuPtr = new IOField<scalar>
new IOField<scalar> (
IOobject
( (
IOobject "Nu",
( c.time().timeName(),
"Nu", c,
c.time().timeName(), IOobject::NO_READ,
c, IOobject::NO_WRITE,
IOobject::NO_READ IOobject::REGISTER
) )
); );
NuPtr->store(); NuPtr->store();
} }
auto& Nu = *NuPtr;
auto& Nu = c.template lookupObjectRef<IOField<scalar>>("Nu"); Nu.resize(c.size());
Nu.setSize(c.size());
const auto& heatTransfer = tc.heatTransfer(); const auto& heatTransfer = tc.heatTransfer();
typename parcelType::trackingData& nctd = typename parcelType::trackingData& nctd =

28
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleDose/ParticleDose.C
View File

@ -64,24 +64,26 @@ void Foam::ParticleDose<CloudType>::postEvolve
{ {
auto& c = this->owner(); auto& c = this->owner();
if (!c.template foundObject<IOField<scalar>>("D")) auto* DPtr = c.template getObjectPtr<IOField<scalar>>("D");
if (!DPtr)
{ {
auto* DPtr = DPtr = new IOField<scalar>
new IOField<scalar> (
IOobject
( (
IOobject "D",
( c.time().timeName(),
"D", c,
c.time().timeName(), IOobject::NO_READ,
c, IOobject::NO_WRITE,
IOobject::NO_READ IOobject::REGISTER
) )
); );
DPtr->store(); DPtr->store();
} }
auto& D = *DPtr;
auto& D = c.template lookupObjectRef<IOField<scalar>>("D");
D.resize(c.size(), Zero); D.resize(c.size(), Zero);

29
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.C
View File

@ -62,25 +62,28 @@ void Foam::ThermoReynoldsNumber<CloudType>::postEvolve
{ {
auto& c = this->owner(); auto& c = this->owner();
if (!c.template foundObject<IOField<scalar>>("Re")) auto* RePtr = c.template getObjectPtr<IOField<scalar>>("Re");
if (!RePtr)
{ {
auto* RePtr = RePtr = new IOField<scalar>
new IOField<scalar> (
IOobject
( (
IOobject "Re",
( c.time().timeName(),
"Re", c,
c.time().timeName(), IOobject::NO_READ,
c, IOobject::NO_WRITE,
IOobject::NO_READ IOobject::REGISTER
) )
); );
RePtr->store(); RePtr->store();
} }
auto& Re = *RePtr;
auto& Re = c.template lookupObjectRef<IOField<scalar>>("Re"); Re.resize(c.size());
Re.setSize(c.size());
typename parcelType::trackingData& nctd = typename parcelType::trackingData& nctd =
const_cast<typename parcelType::trackingData&>(td); const_cast<typename parcelType::trackingData&>(td);

29
src/lagrangian/intermediate/submodels/CloudFunctionObjects/WeberNumber/WeberNumberReacting.C
View File

@ -62,25 +62,28 @@ void Foam::WeberNumberReacting<CloudType>::postEvolve
{ {
const auto& c = this->owner(); const auto& c = this->owner();
if (!c.template foundObject<IOField<scalar>>("We")) auto* WePtr = c.template getObjectPtr<IOField<scalar>>("We");
if (!WePtr)
{ {
IOField<scalar>* WePtr = WePtr = new IOField<scalar>
new IOField<scalar> (
IOobject
( (
IOobject "We",
( c.time().timeName(),
"We", c,
c.time().timeName(), IOobject::NO_READ,
c, IOobject::NO_WRITE,
IOobject::NO_READ IOobject::REGISTER
) )
); );
WePtr->store(); WePtr->store();
} }
auto& We = *WePtr;
auto& We = c.template lookupObjectRef<IOField<scalar>>("We"); We.resize(c.size());
We.setSize(c.size());
const auto& thermo = c.db().template lookupObject<SLGThermo>("SLGThermo"); const auto& thermo = c.db().template lookupObject<SLGThermo>("SLGThermo");
const auto& liquids = thermo.liquids(); const auto& liquids = thermo.liquids();

3
src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
View File

@ -1158,7 +1158,8 @@ void Foam::triSurfaceMesh::setField(const labelList& values)
meshSubDir, // local meshSubDir, // local
*this, *this,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE,
IOobject::REGISTER
), ),
*this, *this,
dimless, dimless,

19
src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
View File

@ -112,9 +112,11 @@ Foam::word Foam::cellCellStencil::baseName(const word& name)
const Foam::labelIOList& Foam::cellCellStencil::zoneID(const fvMesh& mesh) const Foam::labelIOList& Foam::cellCellStencil::zoneID(const fvMesh& mesh)
{ {
if (!mesh.foundObject<labelIOList>("zoneID")) labelIOList* zoneIDPtr = mesh.getObjectPtr<labelIOList>("zoneID");
if (!zoneIDPtr)
{ {
labelIOList* zoneIDPtr = new labelIOList zoneIDPtr = new labelIOList
( (
IOobject IOobject
( (
@ -123,11 +125,15 @@ const Foam::labelIOList& Foam::cellCellStencil::zoneID(const fvMesh& mesh)
polyMesh::meshSubDir, polyMesh::meshSubDir,
mesh, mesh,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
mesh.nCells() mesh.nCells()
); );
labelIOList& zoneID = *zoneIDPtr;
zoneIDPtr->store();
auto& zoneID = *zoneIDPtr;
volScalarField volZoneID volScalarField volZoneID
( (
@ -146,10 +152,9 @@ const Foam::labelIOList& Foam::cellCellStencil::zoneID(const fvMesh& mesh)
{ {
zoneID[celli] = label(volZoneID[celli]); zoneID[celli] = label(volZoneID[celli]);
} }
zoneIDPtr->store();
} }
return mesh.lookupObject<labelIOList>("zoneID");
return *zoneIDPtr;
} }

3
src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C
View File

@ -101,7 +101,8 @@ bool Foam::functionObjects::filmFlux::execute()
time_.timeName(), time_.timeName(),
filmMesh, filmMesh,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
IOobject::REGISTER
), ),
filmMesh, filmMesh,
dimensionedScalar(dimMass/dimTime, Zero) dimensionedScalar(dimMass/dimTime, Zero)

3
src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
View File

@ -108,7 +108,8 @@ Foam::humidityTemperatureCoupledMixedFvPatchScalarField::thicknessField
mesh.time().timeName(), mesh.time().timeName(),
mesh, mesh,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE,
IOobject::REGISTER
), ),
mesh, mesh,
dimensionedScalar(dimless, Zero) dimensionedScalar(dimless, Zero)

3
src/thermophysicalModels/basic/basicThermo/basicThermo.C
View File

@ -256,7 +256,8 @@ Foam::volScalarField& Foam::basicThermo::lookupOrConstruct
mesh.time().timeName(), mesh.time().timeName(),
mesh, mesh,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE,
IOobject::REGISTER
), ),
mesh mesh
); );

5
src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
View File

@ -121,9 +121,10 @@ Foam::speciesSorptionFvPatchScalarField::field
( (
fieldName, fieldName,
mesh.time().timeName(), mesh.time().timeName(),
mesh, mesh.thisDb(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE,
IOobject::REGISTER
), ),
mesh, mesh,
dimensionedScalar(dim, Zero) dimensionedScalar(dim, Zero)

6
src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
View File

@ -156,10 +156,10 @@ Foam::isoAdvection::isoAdvection
if (porosityEnabled_) if (porosityEnabled_)
{ {
if (mesh_.foundObject<volScalarField>("porosity")) porosityPtr_ = mesh_.getObjectPtr<volScalarField>("porosity");
{
porosityPtr_ = mesh_.getObjectPtr<volScalarField>("porosity");
if (porosityPtr_)
{
if if
( (
gMin(porosityPtr_->primitiveField()) <= 0 gMin(porosityPtr_->primitiveField()) <= 0

21
tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling
View File

@ -25,8 +25,7 @@ cellZoneID
// but is fairly low overhead anyhow // but is fairly low overhead anyhow
volScalarField* getZoneField(const fvMesh& mesh) volScalarField* getZoneField(const fvMesh& mesh)
{ {
volScalarField* volZonePtr = auto* volZonePtr = mesh.getObjectPtr<volScalarField>(fieldName);
mesh.getObjectPtr<volScalarField>(fieldName);
const cellZoneMesh& zones = mesh.cellZones(); const cellZoneMesh& zones = mesh.cellZones();
@ -34,16 +33,22 @@ cellZoneID
{ {
if (!volZonePtr) if (!volZonePtr)
{ {
volZonePtr = &regIOobject::store volZonePtr = new volScalarField
( (
volScalarField::New IOobject
( (
fieldName, fieldName,
mesh, mesh.time().timeName(),
dimless, mesh.thisDb(),
fvPatchScalarField::zeroGradientType() IOobject::NO_READ,
) IOobject::AUTO_WRITE,
IOobject::REGISTER
),
mesh,
dimless,
fvPatchFieldBase::zeroGradientType()
); );
regIOobject::store(volZonePtr);
Info<< "Creating " << fieldName Info<< "Creating " << fieldName
<< " field for postProcessing" << nl; << " field for postProcessing" << nl;

3
tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/controlDict
View File

@ -89,7 +89,8 @@ functions
mesh().time().timeName(), mesh().time().timeName(),
mesh(), mesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE,
IOobject::REGISTER
), ),
mesh(), mesh(),
dimless dimless

3
tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/controlDict
View File

@ -114,7 +114,8 @@ functions
mesh().time().timeName(), mesh().time().timeName(),
mesh(), mesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE,
IOobject::REGISTER
), ),
mesh(), mesh(),
sqr(dimLength)/pow3(dimTime) sqr(dimLength)/pow3(dimTime)

3
tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/controlDict
View File

@ -114,7 +114,8 @@ functions
mesh().time().timeName(), mesh().time().timeName(),
mesh(), mesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE,
IOobject::REGISTER
), ),
mesh(), mesh(),
sqr(dimLength)/pow3(dimTime) sqr(dimLength)/pow3(dimTime)