STYLE: use explicit REGISTER option when storing fields

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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