From 3baebcb1011b42b5f08a6ad2912a77512084c5be Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 15 Jul 2020 10:47:53 +0200
Subject: [PATCH] STYLE: replace uses of autoPtr::empty() with bool check
(#1775)
- less clutter using plain tests with the bool operator:
(!ptr) vs (ptr.empty())
(ptr) vs (!ptr.empty())
---
.../DelaunayMesh/DistributedDelaunayMesh.C | 5 +-
.../mapDistribute/mapDistributeBase.C | 2 +-
src/OpenFOAM/meshes/polyMesh/polyMesh.C | 8 +--
.../thermalBaffle1DFvPatchScalarField.C | 2 +-
.../pointHistory/pointHistory.C | 12 ++---
.../turbulentDFSEMInletFvPatchVectorField.C | 2 +-
...lentDigitalFilterInletFvPatchVectorField.C | 2 +-
.../field/streamLine/streamLineBase.C | 4 +-
...surfaceDisplacementPointPatchVectorField.C | 2 +-
...aceSlipDisplacementPointPatchVectorField.C | 2 +-
...irectionalPressureGradientExplicitSource.C | 2 +-
.../meanVelocityForce/meanVelocityForce.C | 2 +-
.../Templates/KinematicCloud/KinematicCloud.C | 4 +-
.../KinematicCloud/KinematicCloudI.H | 4 +-
.../mappedPolyPatch/mappedPatchBaseI.H | 5 +-
.../triSurfaceMesh/triSurfaceMesh.C | 2 +-
.../triSurfaceSearch/triSurfaceSearch.C | 2 +-
.../adjointBoundaryCondition.C | 4 +-
.../objectiveForceTarget.C | 2 +-
.../objectiveIncompressible.C | 40 +++++++--------
.../objectivePartialVolume.C | 2 +-
.../objectivePtLosses/objectivePtLosses.C | 2 +-
.../adjoint/objectives/objective/objective.C | 50 +++++++++----------
.../FIBase/FIBaseIncompressible.C | 2 +-
.../sensitivitySurfaceIncompressible.C | 4 +-
.../sensitivitySurfacePointsIncompressible.C | 4 +-
.../optMeshMovement/optMeshMovement.C | 2 +-
.../optimisation/updateMethod/SQP/SQP.C | 2 +-
.../NURBS/NURBS3DSurface/NURBS3DSurface.C | 6 +--
.../NURBS3DVolume/NURBS3DVolume.C | 10 ++--
.../optimisation/SIMPLEControlOpt.C | 2 +-
.../adjointRASModel/adjointRASModel.C | 4 +-
.../dynamicOversetFvMesh.C | 6 +--
.../thermalBaffleFvPatchScalarField.C | 10 +---
.../sampledSets/sampledSetsTemplates.C | 4 +-
.../isoSurface/sampledIsoSurface.C | 8 +--
.../sampledCuttingPlane/sampledCuttingPlane.C | 6 +--
.../sampledSurfacesTemplates.C | 4 +-
.../linearSpringDamper/linearSpringDamper.C | 2 +-
.../sixDoFRigidBodyMotionIO.C | 2 +-
.../radiationModel/radiationModel.C | 2 +-
.../radiationModels/solarLoad/solarLoad.C | 6 +--
.../greyMeanAbsorptionEmission.C | 3 +-
.../wideBandAbsorptionEmission.C | 3 +-
.../boundaryRadiationProperties.C | 22 ++++----
45 files changed, 135 insertions(+), 141 deletions(-)
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index bbd54cf4754..e02810916d1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2012-2016 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -625,7 +626,7 @@ void Foam::DistributedDelaunayMesh<Triangulation>::sync
return;
}
- if (allBackgroundMeshBounds_.empty())
+ if (!allBackgroundMeshBounds_)
{
distributeBoundBoxes(bb);
}
@@ -810,7 +811,7 @@ void Foam::DistributedDelaunayMesh<Triangulation>::sync(const boundBox& bb)
return;
}
- if (allBackgroundMeshBounds_.empty())
+ if (!allBackgroundMeshBounds_)
{
distributeBoundBoxes(bb);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
index 5eb53d4214d..1f9cb435857 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
@@ -176,7 +176,7 @@ Foam::List<Foam::labelPair> Foam::mapDistributeBase::schedule
const Foam::List<Foam::labelPair>& Foam::mapDistributeBase::schedule() const
{
- if (schedulePtr_.empty())
+ if (!schedulePtr_)
{
schedulePtr_.reset
(
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 4e1d725c897..b81813c2936 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -860,7 +860,7 @@ Foam::label Foam::polyMesh::nSolutionD() const
const Foam::labelIOList& Foam::polyMesh::tetBasePtIs() const
{
- if (tetBasePtIsPtr_.empty())
+ if (!tetBasePtIsPtr_)
{
if (debug)
{
@@ -894,7 +894,7 @@ const Foam::labelIOList& Foam::polyMesh::tetBasePtIs() const
const Foam::indexedOctree<Foam::treeDataCell>&
Foam::polyMesh::cellTree() const
{
- if (cellTreePtr_.empty())
+ if (!cellTreePtr_)
{
treeBoundBox overallBb(points());
@@ -1087,7 +1087,7 @@ const Foam::labelList& Foam::polyMesh::faceNeighbour() const
const Foam::pointField& Foam::polyMesh::oldPoints() const
{
- if (oldPointsPtr_.empty())
+ if (!oldPointsPtr_)
{
if (debug)
{
@@ -1233,7 +1233,7 @@ void Foam::polyMesh::resetMotion() const
const Foam::globalMeshData& Foam::polyMesh::globalData() const
{
- if (globalMeshDataPtr_.empty())
+ if (!globalMeshDataPtr_)
{
if (debug)
{
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index f982ed44edd..aea435936ea 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -206,7 +206,7 @@ const solidType& thermalBaffle1DFvPatchScalarField<solidType>::solid() const
{
if (this->owner())
{
- if (solidPtr_.empty())
+ if (!solidPtr_)
{
solidPtr_.reset(new solidType(solidDict_));
}
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.C
index 96470ec5fe6..fe616252418 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/functionObjects/pointHistory/pointHistory.C
@@ -91,7 +91,7 @@ Foam::pointHistory::pointHistory
refHistoryPoint_(dict.lookup("refHistoryPoint")),
processor_(-1),
fileName_(dict.get<word>("fileName")),
- historyFilePtr_()
+ historyFilePtr_(nullptr)
{
Info<< "Creating " << this->name() << " function object." << endl;
@@ -144,7 +144,7 @@ Foam::pointHistory::pointHistory
}
// Create history file if not already created
- if (historyFilePtr_.empty())
+ if (!historyFilePtr_)
{
// File update
if (Pstream::master())
@@ -180,13 +180,11 @@ Foam::pointHistory::pointHistory
);
// Add headers to output data
- if (historyFilePtr_.valid())
+ if (historyFilePtr_)
{
historyFilePtr_()
- << "# Time" << tab << "X" << tab
- << "Y" << tab << "Z";
-
- historyFilePtr_() << endl;
+ << "# Time" << tab << "X" << tab << "Y" << tab << "Z"
+ << endl;
}
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index b5f75212eb0..238b84c5029 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -190,7 +190,7 @@ const Foam::pointToPointPlanarInterpolation&
Foam::turbulentDFSEMInletFvPatchVectorField::patchMapper() const
{
// Initialise interpolation (2D planar interpolation by triangulation)
- if (mapperPtr_.empty())
+ if (!mapperPtr_)
{
const fileName samplePointsFile
(
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchVectorField.C
index ac8709c6dd3..6ad03839f7a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchVectorField.C
@@ -36,7 +36,7 @@ const Foam::pointToPointPlanarInterpolation&
Foam::turbulentDigitalFilterInletFvPatchVectorField::patchMapper() const
{
// Initialise interpolation (2D planar interpolation by triangulation)
- if (mapperPtr_.empty())
+ if (!mapperPtr_)
{
// Reread values and interpolate
const fileName samplePointsFile
diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index 4fb9e9e3c76..93b9ff90acf 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -65,7 +65,7 @@ Foam::functionObjects::streamLineBase::trackDirTypeNames
const Foam::word&
Foam::functionObjects::streamLineBase::sampledSetAxis() const
{
- if (sampledSetPtr_.empty())
+ if (!sampledSetPtr_)
{
sampledSetPoints();
}
@@ -77,7 +77,7 @@ Foam::functionObjects::streamLineBase::sampledSetAxis() const
const Foam::sampledSet&
Foam::functionObjects::streamLineBase::sampledSetPoints() const
{
- if (sampledSetPtr_.empty())
+ if (!sampledSetPtr_)
{
sampledSetPtr_ = sampledSet::New
(
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 549499a1621..236616cceec 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -394,7 +394,7 @@ surfaceDisplacementPointPatchVectorField
const Foam::searchableSurfaces&
Foam::surfaceDisplacementPointPatchVectorField::surfaces() const
{
- if (surfacesPtr_.empty())
+ if (!surfacesPtr_)
{
surfacesPtr_.reset
(
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 06ae45244a3..b64a78cca45 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -380,7 +380,7 @@ surfaceSlipDisplacementPointPatchVectorField
const Foam::searchableSurfaces&
Foam::surfaceSlipDisplacementPointPatchVectorField::surfaces() const
{
- if (surfacesPtr_.empty())
+ if (!surfacesPtr_)
{
surfacesPtr_.reset
(
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
index 1b01f2f9951..322a6c06360 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
@@ -501,7 +501,7 @@ void Foam::fv::directionalPressureGradientExplicitSource::constrain
const label
)
{
- if (invAPtr_.empty())
+ if (!invAPtr_)
{
invAPtr_.reset
(
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
index 41ad35a514a..63d0af689ef 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
@@ -237,7 +237,7 @@ void Foam::fv::meanVelocityForce::constrain
const label
)
{
- if (rAPtr_.empty())
+ if (!rAPtr_)
{
rAPtr_.reset
(
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index b7d6d49e4a9..f35a0cd11fc 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -139,7 +139,7 @@ void Foam::KinematicCloud<CloudType>::solve
template<class CloudType>
void Foam::KinematicCloud<CloudType>::buildCellOccupancy()
{
- if (cellOccupancyPtr_.empty())
+ if (!cellOccupancyPtr_)
{
cellOccupancyPtr_.reset
(
@@ -174,7 +174,7 @@ void Foam::KinematicCloud<CloudType>::updateCellOccupancy()
// Only build the cellOccupancy if the pointer is set, i.e. it has
// been requested before.
- if (cellOccupancyPtr_.valid())
+ if (cellOccupancyPtr_)
{
buildCellOccupancy();
}
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 9b2ec4d6697..65b35bde966 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
- Copyright (C) 2019 OpenCFD Ltd.
+ Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -370,7 +370,7 @@ template<class CloudType>
inline Foam::List<Foam::DynamicList<typename CloudType::particleType*>>&
Foam::KinematicCloud<CloudType>::cellOccupancy()
{
- if (cellOccupancyPtr_.empty())
+ if (!cellOccupancyPtr_)
{
buildCellOccupancy();
}
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
index dc507b64e6c..f8bc08307c7 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -150,10 +151,10 @@ inline const Foam::mapDistribute& Foam::mappedPatchBase::map() const
if (topoChange)
{
- mapPtr_.clear();
+ mapPtr_.reset(nullptr);
}
- if (mapPtr_.empty())
+ if (!mapPtr_)
{
calcMapping();
}
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
index f80643164b9..8173fec3bbd 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
@@ -644,7 +644,7 @@ void Foam::triSurfaceMesh::movePoints(const pointField& newPoints)
const Foam::indexedOctree<Foam::treeDataEdge>&
Foam::triSurfaceMesh::edgeTree() const
{
- if (edgeTree_.empty())
+ if (!edgeTree_)
{
if (debug)
{
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
index f58dc0691f2..c281014c8b1 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -205,7 +205,7 @@ void Foam::triSurfaceSearch::clearOut()
const Foam::indexedOctree<Foam::treeDataTriSurface>&
Foam::triSurfaceSearch::tree() const
{
- if (treePtr_.empty())
+ if (!treePtr_)
{
// Calculate bb without constructing local point numbering.
treeBoundBox bb(Zero, Zero);
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C
index 2febf7f9125..cfcbdb63f29 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C
@@ -7,7 +7,7 @@
-------------------------------------------------------------------------------
Copyright (C) 2007-2020 PCOpt/NTUA
Copyright (C) 2013-2020 FOSS GP
- Copyright (C) 2019 OpenCFD Ltd.
+ Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -143,7 +143,7 @@ adjointBoundaryCondition<Type>::computePatchGrad(word name)
template<class Type>
bool adjointBoundaryCondition<Type>::addATCUaGradUTerm()
{
- if (addATCUaGradUTerm_.empty())
+ if (!addATCUaGradUTerm_)
{
addATCUaGradUTerm_.reset(new bool(isA<ATCUaGradU>(getATC())));
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForceTarget/objectiveForceTarget.C b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForceTarget/objectiveForceTarget.C
index b6895320e3e..6f8ccd0b2d9 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForceTarget/objectiveForceTarget.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForceTarget/objectiveForceTarget.C
@@ -83,7 +83,7 @@ bool objectiveForceTarget::write(const bool valid) const
// in order to avoid various instantiations of the same objective
// opening the same file
unsigned int width = IOstream::defaultPrecision() + 5;
- if (objFunctionFilePtr_.empty())
+ if (!objFunctionFilePtr_)
{
setObjectiveFilePtr();
objFunctionFilePtr_()
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C
index dbc0789d24b..5564671e542 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C
@@ -130,7 +130,7 @@ autoPtr<objectiveIncompressible> objectiveIncompressible::New
void objectiveIncompressible::doNormalization()
{
- if (normalize_ && normFactor_.valid())
+ if (normalize_ && normFactor_)
{
const scalar oneOverNorm(1./normFactor_());
@@ -191,7 +191,7 @@ void objectiveIncompressible::doNormalization()
const volVectorField& objectiveIncompressible::dJdv()
{
- if (dJdvPtr_.empty())
+ if (!dJdvPtr_)
{
// If pointer is not set, set it to a zero field
dJdvPtr_.reset
@@ -210,7 +210,7 @@ const volVectorField& objectiveIncompressible::dJdv()
const volScalarField& objectiveIncompressible::dJdp()
{
- if (dJdpPtr_.empty())
+ if (!dJdpPtr_)
{
// If pointer is not set, set it to a zero field
dJdpPtr_.reset
@@ -229,7 +229,7 @@ const volScalarField& objectiveIncompressible::dJdp()
const volScalarField& objectiveIncompressible::dJdT()
{
- if (dJdTPtr_.empty())
+ if (!dJdTPtr_)
{
// If pointer is not set, set it to a zero field
dJdTPtr_.reset
@@ -248,7 +248,7 @@ const volScalarField& objectiveIncompressible::dJdT()
const volScalarField& objectiveIncompressible::dJdTMvar1()
{
- if (dJdTMvar1Ptr_.empty())
+ if (!dJdTMvar1Ptr_)
{
// If pointer is not set, set it to a zero field
dJdTMvar1Ptr_.reset
@@ -267,7 +267,7 @@ const volScalarField& objectiveIncompressible::dJdTMvar1()
const volScalarField& objectiveIncompressible::dJdTMvar2()
{
- if (dJdTMvar2Ptr_.empty())
+ if (!dJdTMvar2Ptr_)
{
// If pointer is not set, set it to a zero field
dJdTMvar2Ptr_.reset
@@ -289,7 +289,7 @@ const fvPatchVectorField& objectiveIncompressible::boundarydJdv
const label patchI
)
{
- if (bdJdvPtr_.empty())
+ if (!bdJdvPtr_)
{
bdJdvPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -302,7 +302,7 @@ const fvPatchScalarField& objectiveIncompressible::boundarydJdvn
const label patchI
)
{
- if (bdJdvnPtr_.empty())
+ if (!bdJdvnPtr_)
{
bdJdvnPtr_.reset(createZeroBoundaryPtr<scalar>(mesh_));
}
@@ -315,7 +315,7 @@ const fvPatchVectorField& objectiveIncompressible::boundarydJdvt
const label patchI
)
{
- if (bdJdvtPtr_.empty())
+ if (!bdJdvtPtr_)
{
bdJdvtPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -328,7 +328,7 @@ const fvPatchVectorField& objectiveIncompressible::boundarydJdp
const label patchI
)
{
- if (bdJdpPtr_.empty())
+ if (!bdJdpPtr_)
{
bdJdpPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -341,7 +341,7 @@ const fvPatchScalarField& objectiveIncompressible::boundarydJdT
const label patchI
)
{
- if (bdJdTPtr_.empty())
+ if (!bdJdTPtr_)
{
bdJdTPtr_.reset(createZeroBoundaryPtr<scalar>(mesh_));
}
@@ -354,7 +354,7 @@ const fvPatchScalarField& objectiveIncompressible::boundarydJdTMvar1
const label patchI
)
{
- if (bdJdTMvar1Ptr_.empty())
+ if (!bdJdTMvar1Ptr_)
{
bdJdTMvar1Ptr_.reset(createZeroBoundaryPtr<scalar>(mesh_));
}
@@ -367,7 +367,7 @@ const fvPatchScalarField& objectiveIncompressible::boundarydJdTMvar2
const label patchI
)
{
- if (bdJdTMvar2Ptr_.empty())
+ if (!bdJdTMvar2Ptr_)
{
bdJdTMvar2Ptr_.reset(createZeroBoundaryPtr<scalar>(mesh_));
}
@@ -377,7 +377,7 @@ const fvPatchScalarField& objectiveIncompressible::boundarydJdTMvar2
const boundaryVectorField& objectiveIncompressible::boundarydJdv()
{
- if (bdJdvPtr_.empty())
+ if (!bdJdvPtr_)
{
bdJdvPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -387,7 +387,7 @@ const boundaryVectorField& objectiveIncompressible::boundarydJdv()
const boundaryScalarField& objectiveIncompressible::boundarydJdvn()
{
- if (bdJdvnPtr_.empty())
+ if (!bdJdvnPtr_)
{
bdJdvnPtr_.reset(createZeroBoundaryPtr<scalar>(mesh_));
}
@@ -397,7 +397,7 @@ const boundaryScalarField& objectiveIncompressible::boundarydJdvn()
const boundaryVectorField& objectiveIncompressible::boundarydJdvt()
{
- if (bdJdvtPtr_.empty())
+ if (!bdJdvtPtr_)
{
bdJdvtPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -407,7 +407,7 @@ const boundaryVectorField& objectiveIncompressible::boundarydJdvt()
const boundaryVectorField& objectiveIncompressible::boundarydJdp()
{
- if (bdJdpPtr_.empty())
+ if (!bdJdpPtr_)
{
bdJdpPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -417,7 +417,7 @@ const boundaryVectorField& objectiveIncompressible::boundarydJdp()
const boundaryScalarField& objectiveIncompressible::boundarydJdT()
{
- if (bdJdTPtr_.empty())
+ if (!bdJdTPtr_)
{
bdJdTPtr_.reset(createZeroBoundaryPtr<scalar>(mesh_));
}
@@ -427,7 +427,7 @@ const boundaryScalarField& objectiveIncompressible::boundarydJdT()
const boundaryScalarField& objectiveIncompressible::boundarydJdTMvar1()
{
- if (bdJdTMvar1Ptr_.empty())
+ if (!bdJdTMvar1Ptr_)
{
bdJdTMvar1Ptr_.reset(createZeroBoundaryPtr<scalar>(mesh_));
}
@@ -437,7 +437,7 @@ const boundaryScalarField& objectiveIncompressible::boundarydJdTMvar1()
const boundaryScalarField& objectiveIncompressible::boundarydJdTMvar2()
{
- if (bdJdTMvar2Ptr_.empty())
+ if (!bdJdTMvar2Ptr_)
{
bdJdTMvar2Ptr_.reset(createZeroBoundaryPtr<scalar>(mesh_));
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectivePartialVolume/objectivePartialVolume.C b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectivePartialVolume/objectivePartialVolume.C
index 3bd600a9e8a..6cb85fea56a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectivePartialVolume/objectivePartialVolume.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectivePartialVolume/objectivePartialVolume.C
@@ -137,7 +137,7 @@ bool objectivePartialVolume::write(const bool valid) const
// in order to avoid various instantiations of the same objective
// opening the same file
unsigned int width = IOstream::defaultPrecision() + 6;
- if (objFunctionFilePtr_.empty())
+ if (!objFunctionFilePtr_)
{
setObjectiveFilePtr();
objFunctionFilePtr_() << setw(4) << "#" << " ";
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectivePtLosses/objectivePtLosses.C b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectivePtLosses/objectivePtLosses.C
index 53792824458..3bbfb181776 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectivePtLosses/objectivePtLosses.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectivePtLosses/objectivePtLosses.C
@@ -242,7 +242,7 @@ bool objectivePtLosses::write(const bool valid) const
// in order to avoid various instantiations of the same objective
// opening the same file
unsigned int width = IOstream::defaultPrecision() + 5;
- if (objFunctionFilePtr_.empty())
+ if (!objFunctionFilePtr_)
{
setObjectiveFilePtr();
objFunctionFilePtr_() << setw(4) << "#" << " ";
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
index 5a0bf4dea6d..b4e3e2d8a35 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
@@ -256,7 +256,7 @@ scalar objective::JCycle() const
J -= target_;
// Normalize here, in order to get the correct value for line search
- if (normalize_ && normFactor_.valid())
+ if (normalize_ && normFactor_)
{
J /= normFactor_();
}
@@ -267,7 +267,7 @@ scalar objective::JCycle() const
void objective::updateNormalizationFactor()
{
- if (normalize_ && normFactor_.empty())
+ if (normalize_ && !normFactor_)
{
normFactor_.reset(new scalar(JCycle()));
}
@@ -327,7 +327,7 @@ bool objective::normalize() const
void objective::doNormalization()
{
- if (normalize_ && normFactor_.valid())
+ if (normalize_ && normFactor_)
{
const scalar oneOverNorm(1./normFactor_());
@@ -414,7 +414,7 @@ void objective::incrementIntegrationTimes(const scalar timeSpan)
const volScalarField& objective::dJdb()
{
- if (dJdbPtr_.empty())
+ if (!dJdbPtr_)
{
// If pointer is not set, set it to a zero field
dJdbPtr_.reset
@@ -434,7 +434,7 @@ const volScalarField& objective::dJdb()
const fvPatchVectorField& objective::boundarydJdb(const label patchI)
{
- if (bdJdbPtr_.empty())
+ if (!bdJdbPtr_)
{
bdJdbPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -444,7 +444,7 @@ const fvPatchVectorField& objective::boundarydJdb(const label patchI)
const fvPatchVectorField& objective::dSdbMultiplier(const label patchI)
{
- if (bdSdbMultPtr_.empty())
+ if (!bdSdbMultPtr_)
{
bdSdbMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -454,7 +454,7 @@ const fvPatchVectorField& objective::dSdbMultiplier(const label patchI)
const fvPatchVectorField& objective::dndbMultiplier(const label patchI)
{
- if (bdndbMultPtr_.empty())
+ if (!bdndbMultPtr_)
{
bdndbMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -464,7 +464,7 @@ const fvPatchVectorField& objective::dndbMultiplier(const label patchI)
const fvPatchVectorField& objective::dxdbMultiplier(const label patchI)
{
- if (bdxdbMultPtr_.empty())
+ if (!bdxdbMultPtr_)
{
bdxdbMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -474,7 +474,7 @@ const fvPatchVectorField& objective::dxdbMultiplier(const label patchI)
const fvPatchVectorField& objective::dxdbDirectMultiplier(const label patchI)
{
- if (bdxdbDirectMultPtr_.empty())
+ if (!bdxdbDirectMultPtr_)
{
bdxdbDirectMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -488,7 +488,7 @@ const vectorField& objective::boundaryEdgeMultiplier
const label edgeI
)
{
- if (bdxdbDirectMultPtr_.empty())
+ if (!bdxdbDirectMultPtr_)
{
FatalErrorInFunction
<< "Unallocated boundaryEdgeMultiplier field"
@@ -500,7 +500,7 @@ const vectorField& objective::boundaryEdgeMultiplier
const fvPatchTensorField& objective::boundarydJdStress(const label patchI)
{
- if (bdJdStressPtr_.empty())
+ if (!bdJdStressPtr_)
{
bdJdStressPtr_.reset(createZeroBoundaryPtr<tensor>(mesh_));
}
@@ -510,7 +510,7 @@ const fvPatchTensorField& objective::boundarydJdStress(const label patchI)
const boundaryVectorField& objective::boundarydJdb()
{
- if (bdJdbPtr_.empty())
+ if (!bdJdbPtr_)
{
bdJdbPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -520,7 +520,7 @@ const boundaryVectorField& objective::boundarydJdb()
const boundaryVectorField& objective::dSdbMultiplier()
{
- if (bdSdbMultPtr_.empty())
+ if (!bdSdbMultPtr_)
{
bdSdbMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -530,7 +530,7 @@ const boundaryVectorField& objective::dSdbMultiplier()
const boundaryVectorField& objective::dndbMultiplier()
{
- if (bdndbMultPtr_.empty())
+ if (!bdndbMultPtr_)
{
bdndbMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -540,7 +540,7 @@ const boundaryVectorField& objective::dndbMultiplier()
const boundaryVectorField& objective::dxdbMultiplier()
{
- if (bdxdbMultPtr_.empty())
+ if (!bdxdbMultPtr_)
{
bdxdbMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -550,7 +550,7 @@ const boundaryVectorField& objective::dxdbMultiplier()
const boundaryVectorField& objective::dxdbDirectMultiplier()
{
- if (bdxdbDirectMultPtr_.empty())
+ if (!bdxdbDirectMultPtr_)
{
bdxdbDirectMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
}
@@ -560,7 +560,7 @@ const boundaryVectorField& objective::dxdbDirectMultiplier()
const vectorField3& objective::boundaryEdgeMultiplier()
{
- if (bdxdbDirectMultPtr_.empty())
+ if (!bdxdbDirectMultPtr_)
{
FatalErrorInFunction
<< "Unallocated boundaryEdgeMultiplier field"
@@ -573,7 +573,7 @@ const vectorField3& objective::boundaryEdgeMultiplier()
const boundaryTensorField& objective::boundarydJdStress()
{
- if (bdJdStressPtr_.empty())
+ if (!bdJdStressPtr_)
{
bdJdStressPtr_.reset(createZeroBoundaryPtr<tensor>(mesh_));
}
@@ -583,7 +583,7 @@ const boundaryTensorField& objective::boundarydJdStress()
const volScalarField& objective::divDxDbMultiplier()
{
- if (divDxDbMultPtr_.empty())
+ if (!divDxDbMultPtr_)
{
// If pointer is not set, set it to a zero field
divDxDbMultPtr_.reset
@@ -604,7 +604,7 @@ const volScalarField& objective::divDxDbMultiplier()
const volTensorField& objective::gradDxDbMultiplier()
{
- if (gradDxDbMultPtr_.empty())
+ if (!gradDxDbMultPtr_)
{
// If pointer is not set, set it to a zero field
gradDxDbMultPtr_.reset
@@ -684,7 +684,7 @@ bool objective::write(const bool valid) const
// File is opened only upon invocation of the write function
// in order to avoid various instantiations of the same objective
// opening the same file
- if (objFunctionFilePtr_.empty())
+ if (!objFunctionFilePtr_)
{
setObjectiveFilePtr();
}
@@ -703,7 +703,7 @@ void objective::writeInstantaneousValue() const
// File is opened only upon invocation of the write function
// in order to avoid various instantiations of the same objective
// opening the same file
- if (instantValueFilePtr_.empty())
+ if (!instantValueFilePtr_)
{
setInstantValueFilePtr();
}
@@ -717,7 +717,7 @@ void objective::writeInstantaneousSeparator() const
{
if (Pstream::master())
{
- if (instantValueFilePtr_.valid())
+ if (instantValueFilePtr_)
{
instantValueFilePtr_() << endl;
}
@@ -740,7 +740,7 @@ void objective::writeMeanValue() const
// File is opened only upon invocation of the write function
// in order to avoid various instantiations of the same objective
// opening the same file
- if (meanValueFilePtr_.empty())
+ if (!meanValueFilePtr_)
{
setMeanValueFilePtr();
}
@@ -755,7 +755,7 @@ void objective::writeMeanValue() const
bool objective::writeData(Ostream& os) const
{
os.writeEntry("JMean", JMean_);
- if (normFactor_.valid())
+ if (normFactor_)
{
os.writeEntry("normFactor", normFactor_());
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.C
index 4cc2993e2af..beb01e35e0b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.C
@@ -55,7 +55,7 @@ void FIBase::read()
);
// Allocate distance solver if needed
- if (includeDistance_ && eikonalSolver_.empty())
+ if (includeDistance_ && !eikonalSolver_)
{
eikonalSolver_.reset
(
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
index 50786bf00fa..e35e9900546 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
@@ -347,7 +347,7 @@ void sensitivitySurface::read()
dict().getOrDefault<bool>("writeGeometricInfo", false);
// Allocate new solvers if necessary
- if (includeDistance_ && eikonalSolver_.empty())
+ if (includeDistance_ && !eikonalSolver_)
{
eikonalSolver_.reset
(
@@ -361,7 +361,7 @@ void sensitivitySurface::read()
)
);
}
- if (includeMeshMovement_ && meshMovementSolver_.empty())
+ if (includeMeshMovement_ && !meshMovementSolver_)
{
meshMovementSolver_.reset
(
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C
index 264839e5153..fbe520c8955 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C
@@ -75,7 +75,7 @@ void sensitivitySurfacePoints::read()
dict().getOrDefault<bool>("includeObjectiveContribution", true);
// Allocate new solvers if necessary
- if (includeDistance_ && eikonalSolver_.empty())
+ if (includeDistance_ && !eikonalSolver_)
{
eikonalSolver_.reset
(
@@ -90,7 +90,7 @@ void sensitivitySurfacePoints::read()
);
}
- if (includeMeshMovement_ && meshMovementSolver_.empty())
+ if (includeMeshMovement_ && !meshMovementSolver_)
{
meshMovementSolver_.reset
(
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C
index 1cce17ff3bf..566165c67f6 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C
@@ -44,7 +44,7 @@ namespace Foam
Foam::scalar Foam::optMeshMovement::getMaxAllowedDisplacement() const
{
- if (maxAllowedDisplacement_.empty())
+ if (!maxAllowedDisplacement_)
{
FatalErrorInFunction
<< "maxAllowedDisplacement requested but not set" << nl
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.C
index 0563693e97e..7626776fed3 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.C
@@ -427,7 +427,7 @@ void Foam::SQP::write()
constraintsSize = constraintsSize*(width + 1) + 2;
// Open file and write header
- if (meritFunctionFile_.empty())
+ if (!meritFunctionFile_)
{
meritFunctionFile_.reset
(
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DSurface/NURBS3DSurface.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DSurface/NURBS3DSurface.C
index 30120c035ed..25758e30bf2 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DSurface/NURBS3DSurface.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DSurface/NURBS3DSurface.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.
@@ -2038,7 +2038,7 @@ scalar NURBS3DSurface::lengthDerivativeV
const labelList& NURBS3DSurface::getBoundaryCPIDs()
{
- if(boundaryCPIDs_.empty())
+ if (!boundaryCPIDs_)
{
const label uNCPs(uBasis_.nCPs());
const label vNCPs(vBasis_.nCPs());
@@ -2082,7 +2082,7 @@ const labelList& NURBS3DSurface::getBoundaryCPIs()
const label& NURBS3DSurface::whichBoundaryCPI(const label& globalCPI)
{
- if(whichBoundaryCPID_.empty())
+ if (!whichBoundaryCPID_)
{
getBoundaryCPIDs();
}
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 908ed1ced27..eeb15d95542 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
@@ -1657,7 +1657,7 @@ Foam::scalar Foam::NURBS3DVolume::computeMaxBoundaryDisplacement
Foam::tmp<Foam::vectorField> Foam::NURBS3DVolume::getPointsInBox()
{
- if (mapPtr_.empty())
+ if (!mapPtr_)
{
findPointsInBox(localSystemCoordinates_);
}
@@ -1672,7 +1672,7 @@ Foam::tmp<Foam::vectorField> Foam::NURBS3DVolume::getPointsInBox()
const Foam::labelList& Foam::NURBS3DVolume::getMap()
{
- if (mapPtr_.empty())
+ if (!mapPtr_)
{
findPointsInBox(localSystemCoordinates_);
}
@@ -1683,7 +1683,7 @@ const Foam::labelList& Foam::NURBS3DVolume::getMap()
const Foam::labelList& Foam::NURBS3DVolume::getReverseMap()
{
- if (reverseMapPtr_.empty())
+ if (!reverseMapPtr_)
{
findPointsInBox(localSystemCoordinates_);
}
@@ -1695,11 +1695,11 @@ const Foam::labelList& Foam::NURBS3DVolume::getReverseMap()
const Foam::pointVectorField& Foam::NURBS3DVolume::getParametricCoordinates()
{
// If not computed yet, compute parametric coordinates
- if (parametricCoordinatesPtr_.empty())
+ if (!parametricCoordinatesPtr_)
{
// Find mesh points inside control points box
// if they have been identified yet
- if (mapPtr_.empty())
+ if (!mapPtr_)
{
findPointsInBox(localSystemCoordinates_);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/solverControl/SIMPLEControl/optimisation/SIMPLEControlOpt.C b/src/optimisation/adjointOptimisation/adjoint/solvers/solverControl/SIMPLEControl/optimisation/SIMPLEControlOpt.C
index 3fe260bb6ec..81336289bcf 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/solverControl/SIMPLEControl/optimisation/SIMPLEControlOpt.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/solverControl/SIMPLEControl/optimisation/SIMPLEControlOpt.C
@@ -126,7 +126,7 @@ bool Foam::SIMPLEControlOpt::loop()
Time& runTime = const_cast<Time&>(mesh_.time());
// Sub-cycle time if this is the first iter
- if (subCycledTimePtr_.empty())
+ if (!subCycledTimePtr_)
{
subCycledTimePtr_.reset(new subCycleTime(runTime, nIters()));
Info<< "Solving equations for solver "
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointRASModel/adjointRASModel.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointRASModel/adjointRASModel.C
index 6e81abaa016..3abbac727c1 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointRASModel/adjointRASModel.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointRASModel/adjointRASModel.C
@@ -260,7 +260,7 @@ bool adjointRASModel::read()
volScalarField& adjointRASModel::getAdjointTMVariable1Inst()
{
- if (adjointTMVariable1Ptr_.empty())
+ if (!adjointTMVariable1Ptr_)
{
// if pointer is not set, set it to a zero field
adjointTMVariable1Ptr_.reset
@@ -287,7 +287,7 @@ volScalarField& adjointRASModel::getAdjointTMVariable1Inst()
volScalarField& adjointRASModel::getAdjointTMVariable2Inst()
{
- if (adjointTMVariable2Ptr_.empty())
+ if (!adjointTMVariable2Ptr_)
{
// if pointer is not set, set it to a zero field
adjointTMVariable2Ptr_.reset
diff --git a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
index 30479a1f076..89013e02d84 100644
--- a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
+++ b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
@@ -551,7 +551,7 @@ const Foam::lduAddressing& Foam::dynamicOversetFvMesh::lduAddr() const
//return dynamicMotionSolverFvMesh::lduAddr();
return dynamicFvMesh::lduAddr();
}
- if (lduPtr_.empty())
+ if (!lduPtr_)
{
// Build extended addressing
updateAddressing();
@@ -567,7 +567,7 @@ Foam::lduInterfacePtrsList Foam::dynamicOversetFvMesh::interfaces() const
//return dynamicMotionSolverFvMesh::interfaces();
return dynamicFvMesh::interfaces();
}
- if (lduPtr_.empty())
+ if (!lduPtr_)
{
// Build extended addressing
updateAddressing();
@@ -579,7 +579,7 @@ Foam::lduInterfacePtrsList Foam::dynamicOversetFvMesh::interfaces() const
const Foam::fvMeshPrimitiveLduAddressing&
Foam::dynamicOversetFvMesh::primitiveLduAddr() const
{
- if (lduPtr_.empty())
+ if (!lduPtr_)
{
FatalErrorInFunction
<< "Extended addressing not allocated" << abort(FatalError);
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
index b22753658df..b9656debb48 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
@@ -110,7 +110,7 @@ thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
&& regionName != "none"
)
{
- if (extrudeMeshPtr_.empty())
+ if (!extrudeMeshPtr_)
{
createPatchMesh();
}
@@ -249,14 +249,6 @@ void thermalBaffleFvPatchScalarField::createPatchMesh()
regionPatches
)
);
-
- if (extrudeMeshPtr_.empty())
- {
- WarningInFunction
- << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
- << " patchMeshPtr not set."
- << endl;
- }
}
diff --git a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
index 8a50c1c29ff..6ffb818ed4a 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.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.
@@ -220,7 +220,7 @@ void Foam::sampledSets::sampleAndWrite(fieldGroup<Type>& fields)
const bool interpolate = interpolationScheme_ != "cell";
// Create or use existing writer
- if (fields.formatter.empty())
+ if (!fields.formatter)
{
fields = writeFormat_;
}
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index a857c882db4..314153913db 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -74,7 +74,7 @@ void Foam::sampledIsoSurface::getIsoFields() const
if
(
- storedVolFieldPtr_.empty()
+ !storedVolFieldPtr_
|| (fvm.time().timeName() != storedVolFieldPtr_().instance())
)
{
@@ -126,7 +126,7 @@ void Foam::sampledIsoSurface::getIsoFields() const
// (volPointInterpolation::interpolate with cache=false deletes any
// registered one or if mesh.changing())
- if (subMeshPtr_.empty())
+ if (!subMeshPtr_)
{
const word pointFldName =
"volPointInterpolate_"
@@ -316,8 +316,8 @@ bool Foam::sampledIsoSurface::updateGeometry() const
// Get sub-mesh if any
if
(
- (-1 != mesh().cellZones().findIndex(zoneNames_))
- && subMeshPtr_.empty()
+ !subMeshPtr_
+ && (-1 != mesh().cellZones().findIndex(zoneNames_))
)
{
const polyBoundaryMesh& patches = mesh().boundaryMesh();
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
index 6718ef56e78..0a9de84b921 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
- Copyright (C) 2016-2019 OpenCFD Ltd.
+ Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -118,8 +118,8 @@ void Foam::sampledCuttingPlane::createGeometry()
// Get sub-mesh if any
if
(
- (-1 != mesh().cellZones().findIndex(zoneNames_))
- && subMeshPtr_.empty()
+ !subMeshPtr_
+ && (-1 != mesh().cellZones().findIndex(zoneNames_))
)
{
const polyBoundaryMesh& patches = mesh().boundaryMesh();
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
index 8033f189914..93e5e6f43c5 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
@@ -110,7 +110,7 @@ void Foam::sampledSurfaces::performAction
if (s.interpolate())
{
- if (interpPtr.empty())
+ if (!interpPtr)
{
interpPtr = interpolation<Type>::New
(
@@ -123,7 +123,7 @@ void Foam::sampledSurfaces::performAction
}
else
{
- if (samplePtr.empty())
+ if (!samplePtr)
{
samplePtr = interpolation<Type>::New
(
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C
index 0e33400d026..556b0c4ef73 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C
@@ -79,7 +79,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpringDamper::restrain
vector& restraintMoment
) const
{
- if (anchor_.empty())
+ if (!anchor_)
{
anchor_.reset
(
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
index e60b01a0cf3..e6cbb4d5989 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
@@ -104,7 +104,7 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const
os.endBlock();
}
- if (!solver_.empty())
+ if (solver_)
{
os << indent << "solver";
solver_->write(os);
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
index d526f35f211..f6ffb6c39ac 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
@@ -237,7 +237,7 @@ void Foam::radiation::radiationModel::correct()
firstIter_ = false;
}
- if (!soot_.empty())
+ if (soot_)
{
soot_->correct();
}
diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
index 944fdb14baa..315bd43c06c 100644
--- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
+++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
- Copyright (C) 2016-2019 OpenCFD Ltd.
+ Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -58,7 +58,7 @@ void Foam::radiation::solarLoad::updateReflectedRays
const labelHashSet& includePatches
)
{
- if (reflectedFaces_.empty() && !hitFaces_.empty())
+ if (!reflectedFaces_ && hitFaces_)
{
reflectedFaces_.reset
(
@@ -117,7 +117,7 @@ void Foam::radiation::solarLoad::updateReflectedRays
bool Foam::radiation::solarLoad::updateHitFaces()
{
- if (hitFaces_.empty())
+ if (!hitFaces_)
{
hitFaces_.reset(new faceShading(mesh_, solarCalc_.direction()));
return true;
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index 5b0319f8109..3e929ae6778 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -129,7 +130,7 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
volScalarField* fldPtr = mesh.getObjectPtr<volScalarField>(specieName);
- if (!lookUpTablePtr_.empty())
+ if (lookUpTablePtr_)
{
if (lookUpTablePtr_().found(specieName))
{
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index d359849c58f..9444a1e9a14 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2018 OpenFOAM Foundation
+ Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -140,7 +141,7 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission
volScalarField* fldPtr = mesh.getObjectPtr<volScalarField>(specieName);
- if (!lookUpTablePtr_.empty())
+ if (lookUpTablePtr_)
{
if (lookUpTablePtr_().found(specieName))
{
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
index be0fe78bf20..3e25ef3d8f9 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2015-2018 OpenCFD Ltd.
+ Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -115,7 +115,7 @@ Foam::radiation::boundaryRadiationProperties::emissivity
scalarField* T
) const
{
- if (!radBoundaryPropertiesPtrList_[patchi].empty())
+ if (radBoundaryPropertiesPtrList_[patchi])
{
return radBoundaryPropertiesPtrList_[patchi]->e
(
@@ -144,7 +144,7 @@ Foam::scalar Foam::radiation::boundaryRadiationProperties::faceEmissivity
scalar T
) const
{
- if (!radBoundaryPropertiesPtrList_[patchi].empty())
+ if (radBoundaryPropertiesPtrList_[patchi])
{
return radBoundaryPropertiesPtrList_[patchi]->e
(
@@ -174,7 +174,7 @@ Foam::radiation::boundaryRadiationProperties::absorptivity
scalarField* T
) const
{
- if (!radBoundaryPropertiesPtrList_[patchi].empty())
+ if (radBoundaryPropertiesPtrList_[patchi])
{
return radBoundaryPropertiesPtrList_[patchi]->a
(
@@ -203,7 +203,7 @@ Foam::scalar Foam::radiation::boundaryRadiationProperties::faceAbsorptivity
scalar T
) const
{
- if (!radBoundaryPropertiesPtrList_[patchi].empty())
+ if (radBoundaryPropertiesPtrList_[patchi])
{
return radBoundaryPropertiesPtrList_[patchi]->a
(
@@ -233,7 +233,7 @@ Foam::radiation::boundaryRadiationProperties::transmissivity
scalarField* T
) const
{
- if (!radBoundaryPropertiesPtrList_[patchi].empty())
+ if (radBoundaryPropertiesPtrList_[patchi])
{
return radBoundaryPropertiesPtrList_[patchi]->t
(
@@ -262,7 +262,7 @@ Foam::scalar Foam::radiation::boundaryRadiationProperties::faceTransmissivity
scalar T
) const
{
- if (!radBoundaryPropertiesPtrList_[patchi].empty())
+ if (radBoundaryPropertiesPtrList_[patchi])
{
return radBoundaryPropertiesPtrList_[patchi]->t
(
@@ -292,7 +292,7 @@ Foam::radiation::boundaryRadiationProperties::diffReflectivity
scalarField* T
) const
{
- if (!radBoundaryPropertiesPtrList_[patchi].empty())
+ if (radBoundaryPropertiesPtrList_[patchi])
{
return radBoundaryPropertiesPtrList_[patchi]->rDiff
(
@@ -321,7 +321,7 @@ Foam::scalar Foam::radiation::boundaryRadiationProperties::faceDiffReflectivity
scalar T
) const
{
- if (!radBoundaryPropertiesPtrList_[patchi].empty())
+ if (radBoundaryPropertiesPtrList_[patchi])
{
return radBoundaryPropertiesPtrList_[patchi]->rDiff
(
@@ -351,7 +351,7 @@ Foam::radiation::boundaryRadiationProperties::specReflectivity
scalarField* T
) const
{
- if (!radBoundaryPropertiesPtrList_[patchi].empty())
+ if (radBoundaryPropertiesPtrList_[patchi])
{
return radBoundaryPropertiesPtrList_[patchi]->rSpec
(
@@ -380,7 +380,7 @@ Foam::scalar Foam::radiation::boundaryRadiationProperties::faceSpecReflectivity
scalar T
) const
{
- if (!radBoundaryPropertiesPtrList_[patchi].empty())
+ if (radBoundaryPropertiesPtrList_[patchi])
{
return radBoundaryPropertiesPtrList_[patchi]->rSpec
(
--
GitLab