ENH: more consistent use of good() or direct testing instead valid()

This commit is contained in:
Mark Olesen
2023-07-19 13:47:19 +02:00
parent 76efcba4c7
commit 945e3e41b1
72 changed files with 139 additions and 148 deletions

View File

@ -453,7 +453,7 @@ Foam::functionObjects::extractEulerianParticles::extractEulerianParticles
fvMeshFunctionObject(name, runTime, dict),
writeFile(runTime, name),
cloud_(mesh_, "eulerianParticleCloud"),
faceZoneName_(word::null),
faceZoneName_(),
zoneID_(-1),
patchIDs_(),
patchFaceIDs_(),

View File

@ -126,7 +126,7 @@ Foam::histogramModel::histogramModel
:
writeFile(mesh, name, "histogram", dict),
mesh_(mesh),
fieldName_(word::null)
fieldName_()
{}

View File

@ -88,7 +88,7 @@ Foam::functionObjects::norm::norm
fieldExpression(name, runTime, dict),
norm_(normType::L1),
divisorPtr_(nullptr),
divisorFieldName_(word::null),
divisorFieldName_(),
p_(-1)
{
read(dict);
@ -127,7 +127,7 @@ bool Foam::functionObjects::norm::read(const dictionary& dict)
{
divisorFieldName_ = dict.get<word>("divisorField");
if (divisorFieldName_ == word::null)
if (divisorFieldName_.empty())
{
FatalIOErrorInFunction(dict)
<< "The norm 'field' needs the input entry 'divisorField'."

View File

@ -78,7 +78,7 @@ Foam::resolutionIndexModel::resolutionIndexModel
)
:
mesh_(mesh),
resultName_(word::null)
resultName_()
{}

View File

@ -206,7 +206,7 @@ void Foam::functionObjects::forceCoeffs::calcMomentCoeffs()
void Foam::functionObjects::forceCoeffs::createIntegratedDataFile()
{
if (!coeffFilePtr_.valid())
if (!coeffFilePtr_)
{
coeffFilePtr_ = newFileAtStartTime("coefficient");
writeIntegratedDataFileHeader("Coefficients", coeffFilePtr_());

View File

@ -412,13 +412,13 @@ void Foam::functionObjects::forces::addToInternalField
void Foam::functionObjects::forces::createIntegratedDataFiles()
{
if (!forceFilePtr_.valid())
if (!forceFilePtr_)
{
forceFilePtr_ = newFileAtStartTime("force");
writeIntegratedDataFileHeader("Force", forceFilePtr_());
}
if (!momentFilePtr_.valid())
if (!momentFilePtr_)
{
momentFilePtr_ = newFileAtStartTime("moment");
writeIntegratedDataFileHeader("Moment", momentFilePtr_());

View File

@ -356,7 +356,7 @@ Foam::functionObjects::sizeDistribution::sizeDistribution
(
selectionModeTypeNames_.get("selectionMode", dict)
),
selectionModeTypeName_(word::null),
selectionModeTypeName_(),
functionType_(functionTypeNames_.get("functionType", dict)),
abszissaType_(abszissaTypeNames_.get("abszissaType", dict)),
nCells_(0),

View File

@ -109,7 +109,7 @@ bool Foam::functionObjects::runTimeControls::minMaxCondition::apply()
const word valueType =
state_.objectResultType(functionObjectName_, fieldName);
if (valueType == word::null)
if (valueType.empty())
{
WarningInFunction
<< "Unable to find entry " << fieldName