From 9af3f85cf98b26daa4239bd89a6cdacabef2156a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 15 Jul 2020 08:50:57 +0200 Subject: [PATCH] STYLE: simplify short-circuit involving autoPtr (#1775) - with '&&' conditions, often better to check for non-null autoPtr first (it is cheap) - check as bool instead of valid() method for cleaner code, especially when the wrapped item itself has a valid/empty or good. Also when handling multiple checks. Now if (ptr && ptr->valid()) if (ptr1 || ptr2) instead if (ptr.valid() && ptr->valid()) if (ptr1.valid() || ptr2.valid()) --- .../BlendedInterfacialModel.C | 65 ++++++++++--------- .../test/dictionaryTokens/dictionaryTokens.C | 18 ++--- .../extrude/extrudeMesh/extrudeMesh.C | 6 +- .../manipulation/checkMesh/checkGeometry.C | 2 +- .../redistributePar/redistributePar.C | 4 +- .../foamToVTK/convertAreaFields.H | 4 +- .../dataConversion/foamToVTK/writeDimFields.H | 4 +- .../dataConversion/foamToVTK/writeVolFields.H | 4 +- .../setExprFields/setExprFields.C | 2 +- .../surface/surfaceCheck/surfaceCheck.C | 2 +- .../surfaceFeatureExtract.C | 4 +- src/OpenFOAM/db/regIOobject/regIOobjectRead.C | 4 +- .../polyMesh/globalMeshData/globalMeshData.C | 10 +-- .../expressions/base/fvExprDriver.C | 4 +- .../expressions/base/fvExprDriverIO.C | 8 +-- .../surfaceFieldValue/surfaceFieldValueI.H | 4 +- .../surfaceFieldValueTemplates.C | 2 +- .../reactionsSensitivityAnalysis.C | 2 +- .../regionSizeDistribution.C | 4 +- .../forces/forceCoeffs/forceCoeffs.C | 4 +- src/functionObjects/forces/forces/forces.C | 2 +- .../utilities/vtkWrite/vtkWriteTemplates.C | 4 +- .../snappySnapDriverFeature.C | 26 +++----- .../mappedPolyPatch/mappedPatchBase.C | 2 +- .../NURBS3DVolume/NURBS3DVolume.C | 2 +- .../RAS/RASModelVariables/RASModelVariables.C | 4 +- ...allBoilingWallFunctionFvPatchScalarField.C | 12 ++-- .../BlendedInterfacialModel.C | 11 ++-- .../sampledSet/shortestPath/shortestPathSet.C | 2 +- .../isoSurface/sampledIsoSurfaceCell.C | 2 +- .../isoSurface/sampledIsoSurfaceTopo.C | 4 +- .../sampledCuttingPlane/sampledCuttingPlane.C | 4 +- .../sampledSurfaces/sampledSurfaces.C | 4 +- .../sampledThresholdCellFaces.C | 3 +- .../radiationModels/solarLoad/solarLoad.C | 2 +- 35 files changed, 118 insertions(+), 123 deletions(-) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C index cd7570bf26..89033668c5 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2014-2016 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -129,12 +130,12 @@ Foam::BlendedInterfacialModel::K() const { tmp f1, f2; - if (model_.valid() || model1In2_.valid()) + if (model_ || model1In2_) { f1 = blending_.f1(pair1In2_.dispersed(), pair2In1_.dispersed()); } - if (model_.valid() || model2In1_.valid()) + if (model_ || model2In1_) { f2 = blending_.f2(pair1In2_.dispersed(), pair2In1_.dispersed()); } @@ -157,17 +158,17 @@ Foam::BlendedInterfacialModel::K() const ) ); - if (model_.valid()) + if (model_) { x.ref() += model_->K()*(f1() - f2()); } - if (model1In2_.valid()) + if (model1In2_) { x.ref() += model1In2_->K()*(1 - f1); } - if (model2In1_.valid()) + if (model2In1_) { x.ref() += model2In1_->K()*f2; } @@ -175,7 +176,7 @@ Foam::BlendedInterfacialModel::K() const if ( correctFixedFluxBCs_ - && (model_.valid() || model1In2_.valid() || model2In1_.valid()) + && (model_ || model1In2_ || model2In1_) ) { correctFixedFluxBCs(x.ref()); @@ -191,7 +192,7 @@ Foam::BlendedInterfacialModel::Kf() const { tmp f1, f2; - if (model_.valid() || model1In2_.valid()) + if (model_ || model1In2_) { f1 = fvc::interpolate ( @@ -199,7 +200,7 @@ Foam::BlendedInterfacialModel::Kf() const ); } - if (model_.valid() || model2In1_.valid()) + if (model_ || model2In1_) { f2 = fvc::interpolate ( @@ -225,17 +226,17 @@ Foam::BlendedInterfacialModel::Kf() const ) ); - if (model_.valid()) + if (model_) { x.ref() += model_->Kf()*(f1() - f2()); } - if (model1In2_.valid()) + if (model1In2_) { x.ref() += model1In2_->Kf()*(1 - f1); } - if (model2In1_.valid()) + if (model2In1_) { x.ref() += model2In1_->Kf()*f2; } @@ -243,7 +244,7 @@ Foam::BlendedInterfacialModel::Kf() const if ( correctFixedFluxBCs_ - && (model_.valid() || model1In2_.valid() || model2In1_.valid()) + && (model_ || model1In2_ || model2In1_) ) { correctFixedFluxBCs(x.ref()); @@ -260,12 +261,12 @@ Foam::BlendedInterfacialModel::F() const { tmp f1, f2; - if (model_.valid() || model1In2_.valid()) + if (model_ || model1In2_) { f1 = blending_.f1(pair1In2_.dispersed(), pair2In1_.dispersed()); } - if (model_.valid() || model2In1_.valid()) + if (model_ || model2In1_) { f2 = blending_.f2(pair1In2_.dispersed(), pair2In1_.dispersed()); } @@ -285,17 +286,17 @@ Foam::BlendedInterfacialModel::F() const dimensioned(modelType::dimF, Zero) ); - if (model_.valid()) + if (model_) { x.ref() += model_->F()*(f1() - f2()); } - if (model1In2_.valid()) + if (model1In2_) { x.ref() += model1In2_->F()*(1 - f1); } - if (model2In1_.valid()) + if (model2In1_) { x.ref() -= model2In1_->F()*f2; // note : subtraction } @@ -303,7 +304,7 @@ Foam::BlendedInterfacialModel::F() const if ( correctFixedFluxBCs_ - && (model_.valid() || model1In2_.valid() || model2In1_.valid()) + && (model_ || model1In2_ || model2In1_) ) { correctFixedFluxBCs(x.ref()); @@ -319,7 +320,7 @@ Foam::BlendedInterfacialModel::Ff() const { tmp f1, f2; - if (model_.valid() || model1In2_.valid()) + if (model_ || model1In2_) { f1 = fvc::interpolate ( @@ -327,7 +328,7 @@ Foam::BlendedInterfacialModel::Ff() const ); } - if (model_.valid() || model2In1_.valid()) + if (model_ || model2In1_) { f2 = fvc::interpolate ( @@ -352,17 +353,17 @@ Foam::BlendedInterfacialModel::Ff() const x.ref().setOriented(); - if (model_.valid()) + if (model_) { x.ref() += model_->Ff()*(f1() - f2()); } - if (model1In2_.valid()) + if (model1In2_) { x.ref() += model1In2_->Ff()*(1 - f1); } - if (model2In1_.valid()) + if (model2In1_) { x.ref() -= model2In1_->Ff()*f2; // note : subtraction } @@ -370,7 +371,7 @@ Foam::BlendedInterfacialModel::Ff() const if ( correctFixedFluxBCs_ - && (model_.valid() || model1In2_.valid() || model2In1_.valid()) + && (model_ || model1In2_ || model2In1_) ) { correctFixedFluxBCs(x.ref()); @@ -386,12 +387,12 @@ Foam::BlendedInterfacialModel::D() const { tmp f1, f2; - if (model_.valid() || model1In2_.valid()) + if (model_ || model1In2_) { f1 = blending_.f1(pair1In2_.dispersed(), pair2In1_.dispersed()); } - if (model_.valid() || model2In1_.valid()) + if (model_ || model2In1_) { f2 = blending_.f2(pair1In2_.dispersed(), pair2In1_.dispersed()); } @@ -414,17 +415,17 @@ Foam::BlendedInterfacialModel::D() const ) ); - if (model_.valid()) + if (model_) { x.ref() += model_->D()*(f1() - f2()); } - if (model1In2_.valid()) + if (model1In2_) { x.ref() += model1In2_->D()*(1 - f1); } - if (model2In1_.valid()) + if (model2In1_) { x.ref() += model2In1_->D()*f2; } @@ -432,7 +433,7 @@ Foam::BlendedInterfacialModel::D() const if ( correctFixedFluxBCs_ - && (model_.valid() || model1In2_.valid() || model2In1_.valid()) + && (model_ || model1In2_ || model2In1_) ) { correctFixedFluxBCs(x.ref()); @@ -451,8 +452,8 @@ bool Foam::BlendedInterfacialModel::hasModel return ( &phase == &(pair_.phase1()) - ? model1In2_.valid() - : model2In1_.valid() + ? bool(model1In2_) + : bool(model2In1_) ); } diff --git a/applications/test/dictionaryTokens/dictionaryTokens.C b/applications/test/dictionaryTokens/dictionaryTokens.C index d958b5d945..f61f6ea34c 100644 --- a/applications/test/dictionaryTokens/dictionaryTokens.C +++ b/applications/test/dictionaryTokens/dictionaryTokens.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017 OpenCFD Ltd. + Copyright (C) 2017-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -53,8 +53,8 @@ Foam::token Foam::dictionaryTokens::keywordToken(const entry& e) bool Foam::dictionaryTokens::setIterator() const { - primIter_.clear(); - dictIter_.clear(); + primIter_.reset(nullptr); + dictIter_.reset(nullptr); if (entryIter_ != dict_.cend()) { @@ -166,8 +166,8 @@ bool Foam::dictionaryTokens::good() const entryIter_ != dict_.cend() && ( - (primIter_.valid() && primIter_().good()) - || (dictIter_.valid() && dictIter_().good()) + (primIter_ && primIter_->good()) + || (dictIter_ && dictIter_->good()) ) ); } @@ -189,8 +189,8 @@ const Foam::token& Foam::dictionaryTokens::operator*() const { if (good()) { - if (primIter_.valid()) return *(primIter_()); - if (dictIter_.valid()) return *(dictIter_()); + if (primIter_) return *(*primIter_); + if (dictIter_) return *(*dictIter_); } return token::undefinedToken; @@ -251,8 +251,8 @@ bool Foam::dictionaryTokens::operator++() if (ok) { - if (primIter_.valid()) ok = ++(primIter_()); - if (dictIter_.valid()) ok = ++(dictIter_()); + if (primIter_) ok = ++(*primIter_); + if (dictIter_) ok = ++(*dictIter_); if (!ok) { diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C index 971c546c29..6a08caed38 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C +++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C @@ -815,9 +815,9 @@ int main(int argc, char *argv[]) polyMesh& mesh = ( - meshFromMesh.valid() - ? meshFromMesh() - : meshFromSurface() + meshFromMesh + ? *meshFromMesh + : *meshFromSurface ); diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C index 4f1f821681..f1a6b5ff3f 100644 --- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C +++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C @@ -954,7 +954,7 @@ Foam::label Foam::checkGeometry patchWriter.reset(new surfaceWriters::vtkWriter()); } - surfaceWriter& wr = (surfWriter.valid() ? *surfWriter : *patchWriter); + surfaceWriter& wr = (surfWriter ? *surfWriter : *patchWriter); // Currently only do AMI checks diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index 9043525a32..d624982254 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -1415,9 +1415,9 @@ autoPtr createReconstructMap autoPtr mapPtr; - if (baseMeshPtr.valid() && baseMeshPtr().nCells()) + if (baseMeshPtr && baseMeshPtr->nCells()) { - const fvMesh& baseMesh = baseMeshPtr(); + const fvMesh& baseMesh = *baseMeshPtr; labelListList cellSubMap(Pstream::nProcs()); cellSubMap[Pstream::masterNo()] = identity(mesh.nCells()); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H index 923cf7fabf..2466cda860 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -56,7 +56,7 @@ if (doFiniteArea) FatalError.throwExceptions(throwing); } - if (faMeshPtr.valid() && nAreaFields) + if (faMeshPtr && nAreaFields) { reportFields::area(Info, objects); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H index bcaf81a9d8..6bdfa0096e 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -85,7 +85,7 @@ bool writeDimField const auto& field = tfield(); - if (internalWriter.valid() && pInterp.valid()) + if (internalWriter && pInterp) { internalWriter->write(field, *pInterp); } diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H index 03bb2bbfe9..e92186fe47 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -99,7 +99,7 @@ bool writeVolField const auto& field = tfield(); // Internal - if (internalWriter.valid() && pInterp.valid()) + if (internalWriter && pInterp) { internalWriter->write(field, *pInterp); } diff --git a/applications/utilities/preProcessing/setExprFields/setExprFields.C b/applications/utilities/preProcessing/setExprFields/setExprFields.C index 2b995e0c31..218c1ecfbf 100644 --- a/applications/utilities/preProcessing/setExprFields/setExprFields.C +++ b/applications/utilities/preProcessing/setExprFields/setExprFields.C @@ -723,7 +723,7 @@ int main(int argc, char *argv[]) mesh.readUpdate(); - if (args.found("dummy-phi") && !dummyPhi.valid()) + if (args.found("dummy-phi") && !dummyPhi) { Info<< "Adding a dummy phi" << endl; dummyPhi.reset diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C index d7492379ba..05f6f7c09c 100644 --- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C +++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C @@ -1043,7 +1043,7 @@ int main(int argc, char *argv[]) // ) // ); // - // if (hitInfo.hit() && intStreamPtr.valid()) + // if (hitInfo.hit() && intStreamPtr) // { // intStreamPtr().write(hitInfo.hitPoint()); // diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C index 010cec6bd6..5523ab8417 100644 --- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C +++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C @@ -346,14 +346,14 @@ int main(int argc, char *argv[]) // Load a single file, or load and combine multiple selected files autoPtr surfPtr = loader.load(loadingOption, scaleFactor); - if (!surfPtr.valid() || surfPtr().empty()) + if (!surfPtr || surfPtr->empty()) { FatalErrorInFunction << "Problem loading surface(s) for entry: " << dictName << exit(FatalError); } - triSurface surf = surfPtr(); + triSurface surf = *surfPtr; Info<< nl << "Statistics:" << nl; diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C index e7fce79fdf..a779c4217f 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C +++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2018 OpenFOAM Foundation - Copyright (C) 2015-2019 OpenCFD Ltd. + Copyright (C) 2015-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -185,7 +185,7 @@ void Foam::regIOobject::close() { Pout<< "regIOobject::close() : " << "finished reading " - << (isPtr_.valid() ? isPtr_().name() : "dummy") + << (isPtr_ ? isPtr_->name() : "dummy") << endl; } diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C index 4062471af1..45a6afaacc 100644 --- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C +++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2015-2019 OpenCFD Ltd. + Copyright (C) 2015-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -128,8 +128,8 @@ void Foam::globalMeshData::calcSharedPoints() const if ( nGlobalPoints_ != -1 - || sharedPointLabelsPtr_.valid() - || sharedPointAddrPtr_.valid() + || sharedPointLabelsPtr_ + || sharedPointAddrPtr_ ) { FatalErrorInFunction @@ -295,8 +295,8 @@ void Foam::globalMeshData::calcSharedEdges() const if ( nGlobalEdges_ != -1 - || sharedEdgeLabelsPtr_.valid() - || sharedEdgeAddrPtr_.valid() + || sharedEdgeLabelsPtr_ + || sharedEdgeAddrPtr_ ) { FatalErrorInFunction diff --git a/src/finiteVolume/expressions/base/fvExprDriver.C b/src/finiteVolume/expressions/base/fvExprDriver.C index b363296dc4..a73c38986b 100644 --- a/src/finiteVolume/expressions/base/fvExprDriver.C +++ b/src/finiteVolume/expressions/base/fvExprDriver.C @@ -190,7 +190,7 @@ bool Foam::expressions::fvExprDriver::readDict { ITstream& is = eptr->stream(); - if (writer_.valid() && storedVariables_.size()) + if (writer_ && !storedVariables_.empty()) { WarningInFunction // << "Context: " << driverContext_ << nl @@ -216,7 +216,7 @@ bool Foam::expressions::fvExprDriver::readDict { ITstream& is = eptr->stream(); - if (writer_.valid() && delayedVariables_.size()) + if (writer_ && !delayedVariables_.empty()) { WarningInFunction // << "Context: " << driverContext_ << nl diff --git a/src/finiteVolume/expressions/base/fvExprDriverIO.C b/src/finiteVolume/expressions/base/fvExprDriverIO.C index 3a25df5bdb..93a64e1a2a 100644 --- a/src/finiteVolume/expressions/base/fvExprDriverIO.C +++ b/src/finiteVolume/expressions/base/fvExprDriverIO.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2010-2018 Bernhard Gschaider - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -261,16 +261,16 @@ Foam::Ostream& Foam::expressions::fvExprDriver::writeCommon void Foam::expressions::fvExprDriver::createWriterAndRead(const word& name) { - if (hasDataToWrite() && !writer_.valid()) + if (!writer_ && hasDataToWrite()) { - writer_.set(new exprDriverWriter(name + "_" + this->type(), *this)); + writer_.reset(new exprDriverWriter(name + "_" + this->type(), *this)); } } void Foam::expressions::fvExprDriver::tryWrite() const { - if (writer_.valid() && mesh().time().outputTime()) + if (writer_ && mesh().time().outputTime()) { writer_->write(); } diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueI.H b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueI.H index 331d20cb2d..f1ce22a48a 100644 --- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueI.H +++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueI.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2017-2019 OpenCFD Ltd. + Copyright (C) 2017-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -38,7 +38,7 @@ withSurfaceFields() const ( stFaceZone == regionType_ || stPatch == regionType_ - || (sampledPtr_.valid() && sampledPtr_->withSurfaceFields()) + || (sampledPtr_ && sampledPtr_->withSurfaceFields()) ); } diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C index 620fa7d46a..8d136cc7af 100644 --- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C +++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C @@ -370,7 +370,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::writeValues Field values(getFieldValues(fieldName, true)); // Write raw values on surface if specified - if (surfaceWriterPtr_.valid() && surfaceWriterPtr_->enabled()) + if (surfaceWriterPtr_ && surfaceWriterPtr_->enabled()) { Field allValues(values); combineFields(allValues); diff --git a/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C b/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C index 878ed42ea4..ef50d4e471 100644 --- a/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C +++ b/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C @@ -34,7 +34,7 @@ template void Foam::functionObjects::reactionsSensitivityAnalysis:: createFileNames() { - if (writeToFile() && !prodFilePtr_.valid()) + if (writeToFile() && !prodFilePtr_) { prodFilePtr_ = createFile("production"); writeHeader(prodFilePtr_(), "production"); diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C index 6375a4ca73..d5c2ee726f 100644 --- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C +++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C @@ -413,8 +413,8 @@ bool Foam::functionObjects::regionSizeDistribution::write() const volScalarField& alpha = ( - alphaPtr.valid() - ? alphaPtr() + alphaPtr + ? *alphaPtr : obr_.lookupObject(alphaName_) ); diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C index e55aa3ef07..5b5e2b2d7c 100644 --- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C +++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2015-2019 OpenCFD Ltd. + Copyright (C) 2015-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -54,7 +54,7 @@ void Foam::functionObjects::forceCoeffs::createFiles() { // Note: Only possible to create bin files after bins have been initialised - if (writeToFile() && !coeffFilePtr_.valid()) + if (writeToFile() && !coeffFilePtr_) { coeffFilePtr_ = createFile("coefficient"); writeIntegratedHeader("Coefficients", coeffFilePtr_()); diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C index b2e824f781..e3dbc07f1f 100644 --- a/src/functionObjects/forces/forces/forces.C +++ b/src/functionObjects/forces/forces/forces.C @@ -58,7 +58,7 @@ void Foam::functionObjects::forces::createFiles() { // Note: Only possible to create bin files after bins have been initialised - if (writeToFile() && !forceFilePtr_.valid()) + if (writeToFile() && !forceFilePtr_) { forceFilePtr_ = createFile("force"); writeIntegratedHeader("Force", forceFilePtr_()); diff --git a/src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C b/src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C index 3152b74e89..1528db7951 100644 --- a/src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C +++ b/src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -126,7 +126,7 @@ Foam::label Foam::functionObjects::vtkWrite::writeVolFields const auto& field = tfield(); // Internal - if (internalWriter.valid() && pInterp.valid()) + if (internalWriter && pInterp) { ok = true; internalWriter->write(field, *pInterp); diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C index 9db24f0e39..752f6d5b95 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C @@ -1253,11 +1253,11 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction const point& pt = pp.localPoints()[pointi]; - if (patchConstraints[pointi].first() == 2 && feStr.valid()) + if (feStr && patchConstraints[pointi].first() == 2) { feStr().write(linePointRef(pt, pt+patchAttraction[pointi])); } - else if (patchConstraints[pointi].first() == 3 && fpStr.valid()) + else if (fpStr && patchConstraints[pointi].first() == 3) { fpStr().write(linePointRef(pt, pt+patchAttraction[pointi])); } @@ -2580,11 +2580,7 @@ void Foam::snappySnapDriver::determineFeatures hasSnapped = true; // Debug: dump missed feature point - if - ( - missedMP0Str.valid() - && !nearInfo.second().hit() - ) + if (missedMP0Str && !nearInfo.second().hit()) { missedMP0Str().write ( @@ -2649,11 +2645,7 @@ void Foam::snappySnapDriver::determineFeatures } // Debug: dump missed feature point - if - ( - missedMP1Str.valid() - && !nearInfo.second().hit() - ) + if (missedMP1Str && !nearInfo.second().hit()) { missedMP1Str().write ( @@ -2693,8 +2685,8 @@ void Foam::snappySnapDriver::determineFeatures { if ( - patchConstraints[pointi].first() == 3 - && featurePointStr.valid() + featurePointStr + && patchConstraints[pointi].first() == 3 ) { featurePointStr().write @@ -2704,8 +2696,8 @@ void Foam::snappySnapDriver::determineFeatures } else if ( - patchConstraints[pointi].first() == 2 - && featureEdgeStr.valid() + featureEdgeStr + && patchConstraints[pointi].first() == 2 ) { featureEdgeStr().write @@ -2812,7 +2804,7 @@ void Foam::snappySnapDriver::determineFeatures } const pointIndexHit& info = nearInfo.second(); - if (info.hit() && featurePointStr.valid()) + if (featurePointStr && info.hit()) { featurePointStr().write ( diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C index cef6859a6f..81babc9c45 100644 --- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C +++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C @@ -763,7 +763,7 @@ const { const word surfType(surfDict_.getOrDefault("type", "none")); - if (!surfPtr_.valid() && surfType != "none") + if (!surfPtr_ && surfType != "none") { word surfName(surfDict_.getOrDefault("name", patch_.name())); diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C index eeb15d9554..46ed2da21d 100644 --- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C +++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C @@ -63,7 +63,7 @@ Foam::label Foam::NURBS3DVolume::getCPID void Foam::NURBS3DVolume::findPointsInBox(const vectorField& meshPoints) { // It is considered an error to recompute points in the control boxes - if (mapPtr_.valid() || reverseMapPtr_.valid()) + if (mapPtr_ || reverseMapPtr_) { FatalErrorInFunction << "Attempting to recompute points residing within control boxes" diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C index b6e57519d6..4394e4884b 100644 --- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C +++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C @@ -7,7 +7,7 @@ ------------------------------------------------------------------------------- Copyright (C) 2007-2019 PCOpt/NTUA Copyright (C) 2013-2019 FOSS GP - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -153,7 +153,7 @@ RASModelVariables::autoTmp RASModelVariables::cloneAutoTmp(const autoTmp& source) const { autoTmp returnField(nullptr); - if (source.valid() && source().valid()) + if (source && source->valid()) { const volScalarField& sf = source()(); DebugInfo diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C index 2d673c7d23..92f9c06aaf 100644 --- a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C +++ b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C @@ -646,12 +646,12 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs() if ( - CHFModel_.valid() - && CHFSoobModel_.valid() - && TDNBModel_.valid() - && MHFModel_.valid() - && LeidenfrostModel_.valid() - && filmBoilingModel_.valid() + CHFModel_ + && CHFSoobModel_ + && TDNBModel_ + && MHFModel_ + && LeidenfrostModel_ + && filmBoilingModel_ ) { diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C index b2b7ba7031..8aa6ad3e5d 100644 --- a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2014-2018 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -106,7 +107,7 @@ Foam::BlendedInterfacialModel::evaluate tmp f1, f2; - if (model_.valid() || model1In2_.valid()) + if (model_ || model1In2_) { f1 = blendedInterfacialModel::interpolate @@ -115,7 +116,7 @@ Foam::BlendedInterfacialModel::evaluate ); } - if (model_.valid() || model2In1_.valid()) + if (model_ || model2In1_) { f2 = blendedInterfacialModel::interpolate @@ -177,7 +178,7 @@ Foam::BlendedInterfacialModel::evaluate if ( correctFixedFluxBCs_ - && (model_.valid() || model1In2_.valid() || model2In1_.valid()) + && (model_ || model1In2_ || model2In1_) ) { correctFixedFluxBCs(x.ref()); @@ -300,8 +301,8 @@ bool Foam::BlendedInterfacialModel::hasModel { return &phase == &(phase1_) - ? model1In2_.valid() - : model2In1_.valid(); + ? bool(model1In2_) + : bool(model2In1_); } diff --git a/src/sampling/sampledSet/shortestPath/shortestPathSet.C b/src/sampling/sampledSet/shortestPath/shortestPathSet.C index 2fcbdd0ed4..8b4ba57e65 100644 --- a/src/sampling/sampledSet/shortestPath/shortestPathSet.C +++ b/src/sampling/sampledSet/shortestPath/shortestPathSet.C @@ -969,7 +969,7 @@ void Foam::shortestPathSet::genSamples markLeakPath, iter, mesh, - (isBlockedFace.valid() ? isBlockedFace() : isBoundaryFace), + (isBlockedFace ? *isBlockedFace : isBoundaryFace), insidePoint, insideCelli, outsidePoint, diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C index c6d8380b05..a5fe5b56f0 100644 --- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C +++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C @@ -107,7 +107,7 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const } const volScalarField& cellFld = - (fieldReadPtr.valid() ? *fieldReadPtr : *cellFldPtr); + (fieldReadPtr ? *fieldReadPtr : *cellFldPtr); auto tpointFld = volPointInterpolation::New(fvm).interpolate(cellFld); diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTopo.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTopo.C index 058cf05fcf..a9ce4fba01 100644 --- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTopo.C +++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTopo.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2018 OpenFOAM Foundation - Copyright (C) 2018-2019 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -107,7 +107,7 @@ bool Foam::sampledIsoSurfaceTopo::updateGeometry() const } const volScalarField& cellFld = - (fieldReadPtr.valid() ? *fieldReadPtr : *cellFldPtr); + (fieldReadPtr ? *fieldReadPtr : *cellFldPtr); auto tpointFld = volPointInterpolation::New(fvm).interpolate(cellFld); diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C index 0a9de84b92..4d846848eb 100644 --- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C +++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C @@ -164,8 +164,8 @@ void Foam::sampledCuttingPlane::createGeometry() // Select either the submesh or the underlying mesh const fvMesh& mesh = ( - subMeshPtr_.valid() - ? subMeshPtr_().subMesh() + subMeshPtr_ + ? subMeshPtr_->subMesh() : fvm ); diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C index 6211ad7d6e..3779ff20d3 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C @@ -326,7 +326,7 @@ bool Foam::sampledSurfaces::read(const dictionary& dict) surfDict ); - if (!surf.valid() || !surf->enabled()) + if (!surf || !surf->enabled()) { continue; } @@ -392,7 +392,7 @@ bool Foam::sampledSurfaces::read(const dictionary& dict) autoPtr surf = input.release(inputi); - if (!surf.valid() || !surf->enabled()) + if (!surf || !surf->enabled()) { continue; } diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C index 719286664f..bdf7861580 100644 --- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C +++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C @@ -102,8 +102,9 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const fvm ); } + const volScalarField& cellFld = - (fieldReadPtr.valid() ? *fieldReadPtr : *cellFldPtr); + (fieldReadPtr ? *fieldReadPtr : *cellFldPtr); thresholdCellFaces surf diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C index 315bd43c06..3d2eeb2d2d 100644 --- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C +++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C @@ -439,7 +439,7 @@ void Foam::radiation::solarLoad::calculateQdiff ); - if (finalAgglom_.size() > 0 && coarseMesh_.empty()) + if (!coarseMesh_ && !finalAgglom_.empty()) { coarseMesh_.reset (