From 12c91b9472eee094b36150f5d74ade19e485271f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 15 Jul 2020 08:50:57 +0200
Subject: [PATCH] STYLE: check autoPtr as plain bool instead of valid()

- cleaner code, more similarity with unique_ptr

  Now
      if (ptr)
      if (!ptr)

  instead
      if (ptr.valid())
      if (!ptr.valid())
---
 .../orderedPhasePair/orderedPhasePair.C       |  3 +-
 applications/test/autoPtr/Test-autoPtr.C      | 14 ++---
 .../combinePatchFaces/combinePatchFaces.C     |  6 +-
 .../extrude/extrudeMesh/extrudeMesh.C         | 16 ++---
 .../manipulation/checkMesh/checkGeometry.C    | 38 ++++++------
 .../manipulation/checkMesh/checkMeshQuality.C |  2 +-
 .../manipulation/checkMesh/checkTopology.C    | 22 +++----
 .../manipulation/polyDualMesh/meshDualiser.C  | 13 +++--
 .../mesh/manipulation/setSet/setSet.C         | 10 ++--
 .../mesh/manipulation/topoSet/topoSet.C       |  4 +-
 .../foamFormatConvert/foamFormatConvert.C     |  4 +-
 .../decomposePar/domainDecomposition.C        |  6 +-
 .../redistributePar/redistributePar.C         | 10 ++--
 .../foamToVTK/convertProcessorPatches.H       |  4 +-
 .../foamToVTK/convertVolumeFields.H           |  6 +-
 .../dataConversion/foamToVTK/writeDimFields.H |  2 +-
 .../foamToVTK/writePointFields.H              |  4 +-
 .../dataConversion/foamToVTK/writeVolFields.H |  2 +-
 .../lumpedPointZones/lumpedPointZones.C       |  4 +-
 .../setExprFields/setExprFields.C             |  6 +-
 .../surface/surfaceCheck/surfaceCheck.C       | 14 ++---
 .../surfaceFeatureExtract.C                   |  6 +-
 .../surfaceMeshExport/surfaceMeshExport.C     |  4 +-
 src/OpenFOAM/db/IOobjectList/IOobjectList.C   |  6 +-
 .../functionObjectList/functionObjectList.C   | 12 ++--
 .../db/functionObjects/writeFile/writeFile.C  |  2 +-
 src/OpenFOAM/db/regIOobject/regIOobjectRead.C |  6 +-
 .../expressions/exprResult/exprResult.C       |  4 +-
 .../expressions/exprResult/exprResultI.H      |  4 +-
 .../codedFixedValuePointPatchField.C          |  4 +-
 src/OpenFOAM/global/argList/argList.C         |  2 +-
 .../interpolationTable/interpolationTable.C   |  2 +-
 .../GAMGAgglomeration/GAMGAgglomeration.H     |  4 +-
 .../procFacesGAMGProcAgglomeration.C          |  6 +-
 .../polyMesh/globalMeshData/globalMeshData.C  | 58 +++++++++----------
 .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.H |  3 +-
 .../polyBoundaryMesh/polyBoundaryMesh.C       |  6 +-
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       | 30 +++++-----
 src/OpenFOAM/meshes/polyMesh/polyMeshClear.C  |  4 +-
 src/OpenFOAM/meshes/polyMesh/polyMeshIO.C     |  2 +-
 src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C |  8 +--
 .../constraint/processor/processorPolyPatch.C |  6 +-
 .../RAS/mixtureKEpsilon/mixtureKEpsilon.C     |  2 +-
 .../codedFixedValueFvPatchField.C             |  4 +-
 .../codedMixed/codedMixedFvPatchField.C       |  4 +-
 .../fixedProfile/fixedProfileFvPatchField.C   |  3 +-
 .../freestream/freestreamFvPatchField.C       | 14 ++---
 .../uniformFixedGradientFvPatchField.C        |  2 +-
 .../surfaceFieldValue/surfaceFieldValue.C     | 16 ++---
 .../surfaceFieldValueTemplates.C              |  8 +--
 .../regionSizeDistribution.C                  |  2 +-
 .../codedFunctionObject/codedFunctionObject.C |  4 +-
 .../utilities/ensightWrite/ensightWrite.C     |  2 +-
 .../ensightWrite/ensightWriteUpdate.C         | 10 ++--
 .../utilities/vtkWrite/vtkWrite.C             |  6 +-
 .../utilities/vtkWrite/vtkWriteTemplates.C    |  2 +-
 ...lacementComponentLaplacianFvMotionSolver.C |  2 +-
 .../displacementLaplacianFvMotionSolver.C     |  6 +-
 ...dBodyDisplacementLaplacianFvMotionSolver.C |  6 +-
 ...meVaryingMappedFixedValuePointPatchField.C |  4 +-
 ...polatedDisplacementPointPatchVectorField.C |  4 +-
 .../interRegionOption/interRegionOptionI.H    |  3 +-
 .../jouleHeatingSourceTemplates.C             |  4 +-
 .../rotorDiskSourceTemplates.C                |  4 +-
 .../sources/general/codedSource/CodedSource.C |  4 +-
 .../interRegionHeatTransferModelI.H           |  3 +-
 .../tabulatedHeatTransfer.C                   |  4 +-
 .../tabulatedNTUHeatTransfer.C                |  2 +-
 src/lagrangian/basic/Cloud/Cloud.C            |  3 +-
 .../Templates/ReactingCloud/ReactingCloud.C   |  4 +-
 .../ReactingMultiphaseCloud.C                 |  3 +-
 .../ThermoParcel/ThermoParcelTrackingDataI.H  |  3 +-
 .../ParticleCollector/ParticleCollector.C     |  2 +-
 .../ParticleErosion/ParticleErosion.C         |  4 +-
 .../ParticleTracks/ParticleTracks.C           |  8 +--
 .../ParticleTrap/ParticleTrap.C               |  4 +-
 .../VoidFraction/VoidFraction.C               |  4 +-
 .../Lift/LiftForce/LiftForceI.H               |  3 +-
 .../PressureGradient/PressureGradientForceI.H |  3 +-
 .../LocalInteraction/LocalInteraction.C       |  4 +-
 .../projectCurveEdge/projectCurveEdge.C       |  5 +-
 .../blockEdges/projectEdge/projectEdge.C      |  5 +-
 .../blockFaces/projectFace/projectFace.C      |  8 +--
 .../displacementMeshMoverMotionSolver.C       |  5 +-
 .../medialAxisMeshMover.C                     |  4 +-
 .../meshRefinement/meshRefinement.C           |  2 +-
 .../meshRefinement/meshRefinementBaffles.C    |  2 +-
 .../refinementFeatures/refinementFeatures.C   |  2 +-
 .../snappyHexMeshDriver/snappyLayerDriver.C   | 14 ++---
 .../snappyHexMeshDriver/snappySnapDriver.C    |  6 +-
 .../snappySnapDriverFeature.C                 | 14 ++---
 .../AMIInterpolation/AMIInterpolation.C       |  2 +-
 .../cyclicACMIPointPatchField.H               |  7 ++-
 .../cyclicAMIPointPatchField.H                |  7 ++-
 .../cyclicPeriodicAMIPolyPatch.C              | 27 ++++-----
 .../mappedPolyPatch/mappedPatchBase.C         |  2 +-
 src/meshTools/meshSearch/meshSearch.C         |  8 +--
 .../searchableSurfaces/searchableSurfaces.C   |  2 +-
 .../objectiveIncompressible.C                 | 10 ++--
 .../objectiveIncompressibleI.H                | 26 ++++-----
 .../adjoint/objectives/objective/objective.C  | 20 +++----
 .../adjoint/objectives/objective/objectiveI.H | 26 ++++-----
 .../FIBase/FIBaseIncompressible.C             |  2 +-
 .../adjointMeshMovementSolverIncompressible.C |  2 +-
 .../adjointSensitivityIncompressible.C        |  2 +-
 .../sensitivitySurfaceIncompressible.C        |  4 +-
 .../sensitivitySurfacePointsIncompressible.C  |  4 +-
 .../sensitivity/sensitivity.C                 |  6 +-
 .../shapeSensitivitiesBase.C                  | 30 +++++-----
 .../steadyOptimisation/steadyOptimisation.C   |  4 +-
 .../optimisationTypeIncompressible.C          |  4 +-
 .../shapeOptimisationIncompressible.C         |  2 +-
 .../NURBS3DVolume/NURBS3DVolume.C             |  2 +-
 .../adjointRASModel/adjointRASModel.C         | 12 ++--
 .../cellVolumeWeightCellCellStencil.C         | 10 ++--
 .../cellVolumeWeightCellCellStencil.H         |  2 +-
 .../inverseDistanceCellCellStencil.H          |  4 +-
 .../decompose/decompose/decompositionModel.H  |  4 +-
 .../distributedTriSurfaceMesh.C               |  8 +--
 .../exact/exactPatchDistMethod.C              |  4 +-
 .../BlendedInterfacialModel.C                 |  6 +-
 ...terfaceCompositionPhaseChangePhaseSystem.C |  2 +-
 .../TwoResistanceHeatTransferPhaseSystem.C    |  4 +-
 .../phaseSystem/phaseSystemTemplates.C        |  4 +-
 .../regionModel/regionModel/regionModel.C     |  2 +-
 .../regionModel/regionModel/regionModelI.H    |  5 +-
 .../regionModel1D/regionModel1DI.H            |  3 +-
 .../singleLayerRegion/singleLayerRegion.C     |  5 +-
 .../sampledSet/patchSeed/patchSeedSet.C       |  4 +-
 .../sampledSet/shortestPath/shortestPathSet.C |  7 +--
 .../isoSurface/sampledIsoSurface.C            |  8 +--
 .../isoSurface/sampledIsoSurfaceTemplates.C   |  6 +-
 .../readers/ensight/ensightSurfaceReader.C    |  2 +-
 .../sampledCuttingPlaneTemplates.C            |  6 +-
 .../sampledSurfacesTemplates.C                |  2 +-
 .../SLGThermo/SLGThermo/SLGThermo.C           |  9 +--
 .../radiativeIntensityRay.C                   |  4 +-
 .../radiationModel/radiationModel.C           |  6 +-
 .../dynamicMotionSolverTopoFvMesh.C           |  4 +-
 .../linearValveFvMesh/linearValveFvMesh.C     |  4 +-
 .../linearValveLayersFvMesh.C                 |  4 +-
 .../mixerFvMesh/mixerFvMesh.C                 |  2 +-
 .../movingConeTopoFvMesh.C                    |  2 +-
 .../rawTopoChangerFvMesh.C                    |  3 +-
 144 files changed, 483 insertions(+), 470 deletions(-)

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C
index 65a87f642b..21b6214b4c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -85,7 +86,7 @@ Foam::word Foam::orderedPhasePair::name() const
 
 Foam::tmp<Foam::volScalarField> Foam::orderedPhasePair::E() const
 {
-    if (!aspectRatio_.valid())
+    if (!aspectRatio_)
     {
         FatalErrorInFunction
             << "Aspect ratio model not specified for " << *this << "."
diff --git a/applications/test/autoPtr/Test-autoPtr.C b/applications/test/autoPtr/Test-autoPtr.C
index d0b18a0dad..ed621ea0f2 100644
--- a/applications/test/autoPtr/Test-autoPtr.C
+++ b/applications/test/autoPtr/Test-autoPtr.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,7 +44,7 @@ void testTransfer1(autoPtr<labelList> ap)
     // Passed in copy, so automatically removes content
     // Transfer would be nice, but not actually needed
 
-    Info<< "recv " << Switch::name(ap.valid()) << nl;
+    Info<< "recv " << Switch::name(bool(ap)) << nl;
 }
 
 
@@ -53,7 +53,7 @@ void testTransfer1(autoPtr<labelList> ap)
 void testTransfer2(autoPtr<labelList>&& ap)
 {
     // As rvalue, so this time we actually get to manage content
-    Info<< "recv " << Switch::name(ap.valid()) << nl;
+    Info<< "recv " << Switch::name(bool(ap)) << nl;
 }
 
 
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
 
         testTransfer2(std::move(list));
 
-        Info<<"now have valid=" << Switch::name(list.valid());
+        Info<<"now have valid=" << Switch::name(bool(list));
 
         if (list)
         {
@@ -209,9 +209,9 @@ int main(int argc, char *argv[])
 
         testTransfer2(std::move(list));
 
-        Info<<"now have valid=" << Switch::name(list.valid());
+        Info<<"now have valid=" << Switch::name(bool(list));
 
-        if (list.valid())
+        if (list)
         {
             Info<< nl
                 << flatOutput(*list) << " @ " << name(list->cdata())
@@ -229,7 +229,7 @@ int main(int argc, char *argv[])
         auto ptr1 = autoPtr<labelList>::New();
         auto ptr2 = autoPtr<labelList>::New();
 
-        Info<<"ptr valid: " << ptr1.valid() << nl;
+        Info<<"ptr valid: " << bool(ptr1) << nl;
 
         // Refuses to compile (good!):   ptr1 = new labelList(10);
 
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index a37ac14a39..b4591c7721 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -137,9 +137,9 @@ label mergePatchFaces
         // Faces in error.
         labelHashSet errorFaces;
 
-        if (qualDictPtr.valid())
+        if (qualDictPtr)
         {
-            motionSmoother::checkMesh(false, mesh, qualDictPtr(), errorFaces);
+            motionSmoother::checkMesh(false, mesh, *qualDictPtr, errorFaces);
         }
         else
         {
@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
     );
 
     // Merge points on straight edges and remove unused points
-    if (qualDict.valid())
+    if (qualDict)
     {
         Info<< "Merging all 'loose' points on surface edges, "
             << "regardless of the angle they make." << endl;
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 6a08caed38..7d0909ba5b 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -731,9 +731,9 @@ int main(int argc, char *argv[])
         );
 
         // Update
-        if (refDataPtr.valid())
+        if (refDataPtr)
         {
-            refDataPtr().updateMesh(map());
+            refDataPtr->updateMesh(map());
         }
 
         // Store added cells
@@ -896,9 +896,9 @@ int main(int argc, char *argv[])
             updateFaceLabels(map(), backPatchFaces);
             updateCellSet(map(), addedCellsSet);
 
-            if (refDataPtr.valid())
+            if (refDataPtr)
             {
-                refDataPtr().updateMesh(map());
+                refDataPtr->updateMesh(map());
             }
 
             // Move mesh (if inflation used)
@@ -1029,9 +1029,9 @@ int main(int argc, char *argv[])
         // Update local data
         updateCellSet(map(), addedCellsSet);
 
-        if (refDataPtr.valid())
+        if (refDataPtr)
         {
-            refDataPtr().updateMesh(map());
+            refDataPtr->updateMesh(map());
         }
 
         // Move mesh (if inflation used)
@@ -1067,9 +1067,9 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (refDataPtr.valid())
+    if (refDataPtr)
     {
-        refDataPtr().write();
+        refDataPtr->write();
     }
 
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index f1a6b5ff3f..90268fdf4b 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -539,7 +539,7 @@ Foam::label Foam::checkGeometry
                     << nonAlignedPoints.name() << endl;
                 nonAlignedPoints.instance() = mesh.pointsInstance();
                 nonAlignedPoints.write();
-                if (setWriter.valid())
+                if (setWriter)
                 {
                     mergeAndWrite(*setWriter, nonAlignedPoints);
                 }
@@ -573,7 +573,7 @@ Foam::label Foam::checkGeometry
                     << " non closed cells to set " << cells.name() << endl;
                 cells.instance() = mesh.pointsInstance();
                 cells.write();
-                if (surfWriter.valid())
+                if (surfWriter)
                 {
                     mergeAndWrite(*surfWriter, cells);
                 }
@@ -589,7 +589,7 @@ Foam::label Foam::checkGeometry
                 << aspectCells.name() << endl;
             aspectCells.instance() = mesh.pointsInstance();
             aspectCells.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, aspectCells);
             }
@@ -610,7 +610,7 @@ Foam::label Foam::checkGeometry
                     << " zero area faces to set " << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
-                if (surfWriter.valid())
+                if (surfWriter)
                 {
                     mergeAndWrite(*surfWriter, faces);
                 }
@@ -632,7 +632,7 @@ Foam::label Foam::checkGeometry
                     << " zero volume cells to set " << cells.name() << endl;
                 cells.instance() = mesh.pointsInstance();
                 cells.write();
-                if (surfWriter.valid())
+                if (surfWriter)
                 {
                     mergeAndWrite(*surfWriter, cells);
                 }
@@ -655,7 +655,7 @@ Foam::label Foam::checkGeometry
                 << " non-orthogonal faces to set " << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, faces);
             }
@@ -677,7 +677,7 @@ Foam::label Foam::checkGeometry
                     << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
-                if (surfWriter.valid())
+                if (surfWriter)
                 {
                     mergeAndWrite(*surfWriter, faces);
                 }
@@ -699,7 +699,7 @@ Foam::label Foam::checkGeometry
                     << " skew faces to set " << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
-                if (surfWriter.valid())
+                if (surfWriter)
                 {
                     mergeAndWrite(*surfWriter, faces);
                 }
@@ -723,7 +723,7 @@ Foam::label Foam::checkGeometry
                     << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
-                if (surfWriter.valid())
+                if (surfWriter)
                 {
                     mergeAndWrite(*surfWriter, faces);
                 }
@@ -756,7 +756,7 @@ Foam::label Foam::checkGeometry
                     << "decomposition tets to set " << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
-                if (surfWriter.valid())
+                if (surfWriter)
                 {
                     mergeAndWrite(*surfWriter, faces);
                 }
@@ -781,7 +781,7 @@ Foam::label Foam::checkGeometry
                     << endl;
                 points.instance() = mesh.pointsInstance();
                 points.write();
-                if (setWriter.valid())
+                if (setWriter)
                 {
                     mergeAndWrite(*setWriter, points);
                 }
@@ -804,7 +804,7 @@ Foam::label Foam::checkGeometry
                     << " apart) points to set " << nearPoints.name() << endl;
                 nearPoints.instance() = mesh.pointsInstance();
                 nearPoints.write();
-                if (setWriter.valid())
+                if (setWriter)
                 {
                     mergeAndWrite(*setWriter, nearPoints);
                 }
@@ -828,7 +828,7 @@ Foam::label Foam::checkGeometry
                     << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
-                if (surfWriter.valid())
+                if (surfWriter)
                 {
                     mergeAndWrite(*surfWriter, faces);
                 }
@@ -851,7 +851,7 @@ Foam::label Foam::checkGeometry
                     << " warped faces to set " << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
-                if (surfWriter.valid())
+                if (surfWriter)
                 {
                     mergeAndWrite(*surfWriter, faces);
                 }
@@ -872,7 +872,7 @@ Foam::label Foam::checkGeometry
                 << " under-determined cells to set " << cells.name() << endl;
             cells.instance() = mesh.pointsInstance();
             cells.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, cells);
             }
@@ -892,7 +892,7 @@ Foam::label Foam::checkGeometry
                 << " concave cells to set " << cells.name() << endl;
             cells.instance() = mesh.pointsInstance();
             cells.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, cells);
             }
@@ -913,7 +913,7 @@ Foam::label Foam::checkGeometry
                 << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, faces);
             }
@@ -934,7 +934,7 @@ Foam::label Foam::checkGeometry
                 << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, faces);
             }
@@ -949,7 +949,7 @@ Foam::label Foam::checkGeometry
         const word procAndTime(Foam::name(Pstream::myProcNo()) + "_" + tmName);
 
         autoPtr<surfaceWriter> patchWriter;
-        if (!surfWriter.valid())
+        if (!surfWriter)
         {
             patchWriter.reset(new surfaceWriters::vtkWriter());
         }
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.C b/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.C
index 26dfbb6d20..d97308d6ec 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.C
@@ -30,7 +30,7 @@ Foam::label Foam::checkMeshQuality
             faces.instance() = mesh.pointsInstance();
             faces.write();
 
-            if (writer.valid())
+            if (writer)
             {
                 mergeAndWrite(*writer, faces);
             }
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index ebb2a62255..cfd0a579fa 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -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.
@@ -202,7 +202,7 @@ Foam::label Foam::checkTopology
                 << " illegal cells to set " << cells.name() << endl;
             cells.instance() = mesh.pointsInstance();
             cells.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, cells);
             }
@@ -226,7 +226,7 @@ Foam::label Foam::checkTopology
                 << " unused points to set " << points.name() << endl;
             points.instance() = mesh.pointsInstance();
             points.write();
-            if (setWriter.valid())
+            if (setWriter)
             {
                 mergeAndWrite(*setWriter, points);
             }
@@ -248,7 +248,7 @@ Foam::label Foam::checkTopology
                 << " unordered faces to set " << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, faces);
             }
@@ -268,7 +268,7 @@ Foam::label Foam::checkTopology
                 << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, faces);
             }
@@ -289,7 +289,7 @@ Foam::label Foam::checkTopology
                 << endl;
             cells.instance() = mesh.pointsInstance();
             cells.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, cells);
             }
@@ -313,7 +313,7 @@ Foam::label Foam::checkTopology
                 << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, faces);
             }
@@ -368,7 +368,7 @@ Foam::label Foam::checkTopology
                 << endl;
             oneCells.instance() = mesh.pointsInstance();
             oneCells.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, oneCells);
             }
@@ -384,7 +384,7 @@ Foam::label Foam::checkTopology
                 << endl;
             twoCells.instance() = mesh.pointsInstance();
             twoCells.write();
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 mergeAndWrite(*surfWriter, twoCells);
             }
@@ -529,7 +529,7 @@ Foam::label Foam::checkTopology
                     << " points that are in multiple regions to set "
                     << points.name() << endl;
                 points.write();
-                if (setWriter.valid())
+                if (setWriter)
                 {
                     mergeAndWrite(*setWriter, points);
                 }
@@ -640,7 +640,7 @@ Foam::label Foam::checkTopology
             << " conflicting points to set " << points.name() << endl;
         points.instance() = mesh.pointsInstance();
         points.write();
-        if (setWriter.valid())
+        if (setWriter)
         {
             mergeAndWrite(*setWriter, points);
         }
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index 18d47f32ff..0abc91fb28 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -1035,9 +1036,9 @@ void Foam::meshDualiser::setRefinement
             -1,     //masterCellID,
             -1      //zoneID
         );
-        if (dualCcStr.valid())
+        if (dualCcStr)
         {
-            meshTools::writeOBJ(dualCcStr(), mesh_.points()[pointi]);
+            meshTools::writeOBJ(*dualCcStr, mesh_.points()[pointi]);
         }
     }
 
@@ -1079,11 +1080,11 @@ void Foam::meshDualiser::setRefinement
                 -1,                                         //masterCellID
                 mesh_.cellZones().whichZone(pCells[pCelli]) //zoneID
             );
-            if (dualCcStr.valid())
+            if (dualCcStr)
             {
                 meshTools::writeOBJ
                 (
-                    dualCcStr(),
+                    *dualCcStr,
                     0.5*(mesh_.points()[pointi]+cellCentres[pCells[pCelli]])
                 );
             }
@@ -1104,9 +1105,9 @@ void Foam::meshDualiser::setRefinement
                 -1      //zoneID
             );
 
-            if (dualCcStr.valid())
+            if (dualCcStr)
             {
-                meshTools::writeOBJ(dualCcStr(), mesh_.points()[pointi]);
+                meshTools::writeOBJ(*dualCcStr, mesh_.points()[pointi]);
             }
         }
     }
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index e0e60be11c..1473bf293f 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2017-2018 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -393,9 +393,9 @@ bool doCommand
             currentSet.resize(max(currentSet.size(), typSize));
         }
 
-        if (currentSetPtr.valid())
+        if (currentSetPtr)
         {
-            topoSet& currentSet = currentSetPtr();
+            topoSet& currentSet = *currentSetPtr;
 
             Info<< "    Set:" << currentSet.name()
                 << "  Size:" << returnReduce(currentSet.size(), sumOp<label>())
@@ -829,9 +829,9 @@ int main(int argc, char *argv[])
 
             commandStatus stat = INVALID;
 
-            if (fileStreamPtr.valid())
+            if (fileStreamPtr)
             {
-                if (!fileStreamPtr().good())
+                if (!fileStreamPtr->good())
                 {
                     Info<< "End of batch file" << endl;
                     // No error.
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index f8eb90fe09..162fd3fd10 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -394,7 +394,7 @@ int main(int argc, char *argv[])
                 break;
             }
 
-            if (currentSet.valid())
+            if (currentSet)
             {
                 Info<< "    "
                     << currentSet().type() << ' '
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
index f9e5ccebf4..e3cd0db671 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
+++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@@ -426,9 +426,9 @@ int main(int argc, char *argv[])
 
         if (!lagrangianDirs.empty())
         {
-            if (meshPtr.valid())
+            if (meshPtr)
             {
-                meshPtr().readUpdate();
+                meshPtr->readUpdate();
             }
             else
             {
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 8d3d950cf4..49d12e091b 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -334,7 +334,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
 
         autoPtr<polyMesh> procMeshPtr;
 
-        if (facesInstancePointsPtr_.valid())
+        if (facesInstancePointsPtr_)
         {
             // Construct mesh from facesInstance.
             pointField facesInstancePoints
@@ -738,7 +738,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
         procMesh.write();
 
         // Write points if pointsInstance differing from facesInstance
-        if (facesInstancePointsPtr_.valid())
+        if (facesInstancePointsPtr_)
         {
             pointIOField pointsInstancePoints
             (
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index d624982254..96f7bc50df 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -672,9 +672,9 @@ void readFields
             // Load field (but not oldTime)
             readField(io, mesh, i, fields);
             // Create zero sized field and send
-            if (subsetterPtr.valid())
+            if (subsetterPtr)
             {
-                tmp<GeoField> tsubfld = subsetterPtr().interpolate(fields[i]);
+                tmp<GeoField> tsubfld = subsetterPtr->interpolate(fields[i]);
 
                 // Send to all processors that don't have a mesh
                 for (label procI = 1; procI < Pstream::nProcs(); ++procI)
@@ -1803,7 +1803,7 @@ void reconstructLagrangian
 
     if (cloudNames.size())
     {
-        if (!lagrangianReconstructorPtr.valid())
+        if (!lagrangianReconstructorPtr)
         {
             lagrangianReconstructorPtr.reset
             (
@@ -2116,7 +2116,7 @@ void redistributeLagrangian
 {
     if (clouds.size())
     {
-        if (!lagrangianReconstructorPtr.valid())
+        if (!lagrangianReconstructorPtr)
         {
             lagrangianReconstructorPtr.reset
             (
@@ -2804,7 +2804,7 @@ int main(int argc, char *argv[])
                     Info<< "    Detected topology change;"
                         << " reconstructing addressing" << nl << endl;
 
-                    if (baseMeshPtr.valid())
+                    if (baseMeshPtr)
                     {
                         // Cannot do a baseMesh::readUpdate() since not all
                         // processors will have mesh files. So instead just
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H
index 8374aa5bac..cc2aba6bb3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -153,7 +153,7 @@ Description
 
 
     // Finish writers
-    if (internalWriter.valid())
+    if (internalWriter)
     {
         internalWriter->close();
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H
index 72714c7315..d91da0a293 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H
@@ -262,7 +262,7 @@ Description
     // CellData
     {
         // Begin CellData
-        if (internalWriter.valid())
+        if (internalWriter)
         {
             // Optionally with cellID and procID fields
             internalWriter->beginCellData
@@ -323,7 +323,7 @@ Description
     if (doPointValues)
     {
         // Begin PointData
-        if (internalWriter.valid())
+        if (internalWriter)
         {
             internalWriter->beginPointData
             (
@@ -386,7 +386,7 @@ Description
 
 
     // Finish writers
-    if (internalWriter.valid())
+    if (internalWriter)
     {
         internalWriter->close();
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H
index 6bdfa0096e..345c467eeb 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H
@@ -60,7 +60,7 @@ bool writeDimField
 
     const auto& field = tfield();
 
-    if (internalWriter.valid())
+    if (internalWriter)
     {
         internalWriter->write(field);
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointFields.H
index 3a55fac6d5..6c845d7c0d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointFields.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.
@@ -83,7 +83,7 @@ bool writePointField
     const auto& field = tproxied();
 
     // Internal
-    if (internalWriter.valid())
+    if (internalWriter)
     {
         internalWriter->write(field);
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H
index e92186fe47..66ce5331bb 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H
@@ -63,7 +63,7 @@ bool writeVolField
     const auto& field = tfield();
 
     // Internal
-    if (internalWriter.valid())
+    if (internalWriter)
     {
         internalWriter->write(field);
     }
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C b/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C
index d0edb92330..aae3d4c869 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C
+++ b/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
         autoPtr<lumpedPointIOMovement> movement =
             lumpedPointIOMovement::New(runTime);
 
-        if (!movement.valid())
+        if (!movement)
         {
             Info<< "No valid movement found" << endl;
             return 1;
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
 
     autoPtr<lumpedPointIOMovement> movement = lumpedPointIOMovement::New(mesh);
 
-    if (!movement.valid())
+    if (!movement)
     {
         Info<< "No valid movement found" << endl;
         return 1;
diff --git a/applications/utilities/preProcessing/setExprFields/setExprFields.C b/applications/utilities/preProcessing/setExprFields/setExprFields.C
index 218c1ecfbf..57e05ad4cb 100644
--- a/applications/utilities/preProcessing/setExprFields/setExprFields.C
+++ b/applications/utilities/preProcessing/setExprFields/setExprFields.C
@@ -802,9 +802,9 @@ int main(int argc, char *argv[])
                 ctrl
             );
         }
-        else if (exprDictPtr.valid())
+        else if (exprDictPtr)
         {
-            const dictionary& exprDict = exprDictPtr();
+            const dictionary& exprDict = *exprDictPtr;
 
             // Read set construct info from dictionary
             PtrList<entry> actions(exprDict.lookup("expressions"));
@@ -898,7 +898,7 @@ int main(int argc, char *argv[])
                 );
             }
         }
-        else if (exprDictPtr.valid())
+        else
         {
             FatalErrorInFunction
                 << "No command-line or dictionary??" << nl << endl
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 05f6f7c09c..87a04e1e21 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -469,7 +469,7 @@ int main(int argc, char *argv[])
             Info<< "Surface has " << illegalFaces.size()
                 << " illegal triangles." << endl;
 
-            if (surfWriter.valid())
+            if (surfWriter)
             {
                 boolList isIllegalFace(surf.size(), false);
                 UIndirectList<bool>(isIllegalFace, illegalFaces) = true;
@@ -598,7 +598,7 @@ int main(int argc, char *argv[])
         }
 
         // Dump for subsetting
-        if (surfWriter.valid())
+        if (surfWriter)
         {
             // Transcribe faces
             faceList faces(surf.size());
@@ -867,7 +867,7 @@ int main(int argc, char *argv[])
         {
             Info<< "Splitting surface into parts ..." << endl << endl;
 
-            if (!surfWriter.valid())
+            if (!surfWriter)
             {
                 surfWriter.reset(new surfaceWriters::vtkWriter());
             }
@@ -933,7 +933,7 @@ int main(int argc, char *argv[])
 
         if (outputThreshold > 0)
         {
-            if (!surfWriter.valid())
+            if (!surfWriter)
             {
                 surfWriter.reset(new surfaceWriters::vtkWriter());
             }
@@ -1001,7 +1001,7 @@ int main(int argc, char *argv[])
             {
                 nInt++;
 
-                if (intStreamPtr.valid())
+                if (intStreamPtr)
                 {
                     intStreamPtr().write(hitInfo.hitPoint());
                 }
@@ -1013,7 +1013,7 @@ int main(int argc, char *argv[])
                 {
                     nInt++;
 
-                    if (intStreamPtr.valid())
+                    if (intStreamPtr)
                     {
                         intStreamPtr().write(hitInfo2.hitPoint());
                     }
@@ -1070,7 +1070,7 @@ int main(int argc, char *argv[])
             Info<< "Surface is self-intersecting at " << nInt
                 << " locations." << endl;
 
-            if (intStreamPtr.valid())
+            if (intStreamPtr)
             {
                 Info<< "Writing intersection points to "
                     << intStreamPtr().name() << endl;
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 5523ab8417..9cf57bc341 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -711,7 +711,7 @@ int main(int argc, char *argv[])
                     10   // externalAngleTolerance
                 );
 
-            if (vtkWriter.valid())
+            if (vtkWriter)
             {
                 vtkWriter->beginCellData();
                 vtkWriter->write("internalCloseness", tcloseness[0]());
@@ -735,7 +735,7 @@ int main(int argc, char *argv[])
                     maxProximity
                 );
 
-            if (vtkWriter.valid())
+            if (vtkWriter)
             {
                 vtkWriter->beginCellData();
                 vtkWriter->write("featureProximity", tproximity());
@@ -753,7 +753,7 @@ int main(int argc, char *argv[])
                     surf
                 );
 
-            if (vtkWriter.valid())
+            if (vtkWriter)
             {
                 vtkWriter->beginPointData();
                 vtkWriter->write("curvature", tcurvature());
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index 9430397e41..d80437d35a 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
         surf.cleanup(true);
     }
 
-    if (fromCsys.valid())
+    if (fromCsys)
     {
         Info<< "move points from coordinate system: "
             << fromCsys->name() << endl;
@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
         surf.movePoints(tpf());
     }
 
-    if (toCsys.valid())
+    if (toCsys)
     {
         Info<< "move points to coordinate system: "
             << toCsys->name() << endl;
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index dd50e0c930..85439ec787 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -163,7 +163,7 @@ Foam::IOobjectList::IOobjectList
 
 bool Foam::IOobjectList::add(autoPtr<IOobject>& objectPtr)
 {
-    if (objectPtr.valid())
+    if (objectPtr)
     {
         return insert(objectPtr->name(), objectPtr);
     }
@@ -174,7 +174,7 @@ bool Foam::IOobjectList::add(autoPtr<IOobject>& objectPtr)
 
 bool Foam::IOobjectList::add(autoPtr<IOobject>&& objectPtr)
 {
-    if (objectPtr.valid())
+    if (objectPtr)
     {
         return insert(objectPtr->name(), objectPtr);
     }
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 1c3e756098..fc54c45ff1 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -495,7 +495,7 @@ void Foam::functionObjectList::resetState()
 
 Foam::IOdictionary& Foam::functionObjectList::stateDict()
 {
-    if (!stateDictPtr_.valid())
+    if (!stateDictPtr_)
     {
         createStateDict();
     }
@@ -506,7 +506,7 @@ Foam::IOdictionary& Foam::functionObjectList::stateDict()
 
 const Foam::IOdictionary& Foam::functionObjectList::stateDict() const
 {
-    if (!stateDictPtr_.valid())
+    if (!stateDictPtr_)
     {
         createStateDict();
     }
@@ -517,7 +517,7 @@ const Foam::IOdictionary& Foam::functionObjectList::stateDict() const
 
 Foam::objectRegistry& Foam::functionObjectList::storedObjects()
 {
-    if (!objectsRegistryPtr_.valid())
+    if (!objectsRegistryPtr_)
     {
         createOutputRegistry();
     }
@@ -528,7 +528,7 @@ Foam::objectRegistry& Foam::functionObjectList::storedObjects()
 
 const Foam::objectRegistry& Foam::functionObjectList::storedObjects() const
 {
-    if (!objectsRegistryPtr_.valid())
+    if (!objectsRegistryPtr_)
     {
         createOutputRegistry();
     }
@@ -727,7 +727,7 @@ bool Foam::functionObjectList::adjustTimeStep()
 
 bool Foam::functionObjectList::read()
 {
-    if (!stateDictPtr_.valid())
+    if (!stateDictPtr_)
     {
         createStateDict();
     }
@@ -903,7 +903,7 @@ bool Foam::functionObjectList::read()
                 FatalIOError.throwExceptions(throwingIOerr);
 
                 // Required functionObject to be valid on all processors
-                if (returnReduce(foPtr.valid(), andOp<bool>()))
+                if (returnReduce(bool(foPtr), andOp<bool>()))
                 {
                     objPtr.reset(foPtr.release());
                 }
diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
index 39870e4755..36cb7cdd0a 100644
--- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
+++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
@@ -241,7 +241,7 @@ Foam::OFstream& Foam::functionObjects::writeFile::file()
         return Snull;
     }
 
-    if (!filePtr_.valid())
+    if (!filePtr_)
     {
         FatalErrorInFunction
             << "File pointer not allocated\n";
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
index a779c4217f..01b67843c4 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
@@ -106,7 +106,7 @@ Foam::Istream& Foam::regIOobject::readStream(const bool valid)
     }
 
     // Construct object stream and read header if not already constructed
-    if (!isPtr_.valid())
+    if (!isPtr_)
     {
         fileName objPath;
         if (watchIndices_.size())
@@ -152,7 +152,7 @@ Foam::Istream& Foam::regIOobject::readStream
     }
 
     // Construct IFstream if not already constructed
-    if (!isPtr_.valid())
+    if (!isPtr_)
     {
         readStream(valid);
 
@@ -189,7 +189,7 @@ void Foam::regIOobject::close()
             << endl;
     }
 
-    isPtr_.clear();
+    isPtr_.reset(nullptr);
 }
 
 
diff --git a/src/OpenFOAM/expressions/exprResult/exprResult.C b/src/OpenFOAM/expressions/exprResult/exprResult.C
index e53bfacbdd..43de67484d 100644
--- a/src/OpenFOAM/expressions/exprResult/exprResult.C
+++ b/src/OpenFOAM/expressions/exprResult/exprResult.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2018 Bernhard Gschaider <bgschaid@hfd-research.com>
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -518,7 +518,7 @@ void Foam::expressions::exprResult::operator=(const exprResult& rhs)
                 << exit(FatalError);
         }
     }
-    else if (objectPtr_.valid())
+    else if (objectPtr_)
     {
         FatalErrorInFunction
             << "Assignment with general content not possible" << nl
diff --git a/src/OpenFOAM/expressions/exprResult/exprResultI.H b/src/OpenFOAM/expressions/exprResult/exprResultI.H
index 2b49e7ea67..818fa4758f 100644
--- a/src/OpenFOAM/expressions/exprResult/exprResultI.H
+++ b/src/OpenFOAM/expressions/exprResult/exprResultI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2018 Bernhard Gschaider <bgschaid@hfd-research.com>
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -283,7 +283,7 @@ inline bool Foam::expressions::exprResult::isBool() const
 
 inline bool Foam::expressions::exprResult::isObject() const
 {
-    return objectPtr_.valid();
+    return bool(objectPtr_);
 }
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
index d6e38e9f56..bd94be76eb 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -228,7 +228,7 @@ template<class Type>
 const Foam::pointPatchField<Type>&
 Foam::codedFixedValuePointPatchField<Type>::redirectPatchField() const
 {
-    if (!redirectPatchFieldPtr_.valid())
+    if (!redirectPatchFieldPtr_)
     {
         // Construct a patch
         // Make sure to construct the patchfield with up-to-date value
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index eae9002067..e808f5993d 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -1262,7 +1262,7 @@ void Foam::argList::parse
                     fileHandler().NewIFstream(source)
                 );
 
-                if (!decompDictStream.valid() || !decompDictStream->good())
+                if (!decompDictStream || !decompDictStream->good())
                 {
                     FatalError
                         << "Cannot read decomposeParDict from "
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
index 18eaf5bc56..9a4404f5d9 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
@@ -161,7 +161,7 @@ void Foam::interpolationTable<Type>::write(Ostream& os) const
 {
     os.writeEntry("file", fileName_);
     os.writeEntry("outOfBounds", bounds::repeatableBoundingNames[bounding_]);
-    if (reader_.valid())
+    if (reader_)
     {
         reader_->write(os);
     }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
index e3d0f89ce6..0dd96c7150 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -447,7 +447,7 @@ public:
             //- Whether to agglomerate across processors
             bool processorAgglomerate() const
             {
-                return procAgglomeratorPtr_.valid();
+                return bool(procAgglomeratorPtr_);
             }
 
             //- Mapping from processor to agglomerated processor (global, all
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index fcb6addf72..1678a9a5ed 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -170,10 +170,10 @@ Foam::procFacesGAMGProcAgglomeration::processorAgglomeration
     tmp<labelField> tfineToCoarse(new labelField(0));
     labelField& fineToCoarse = tfineToCoarse.ref();
 
-    if (singleCellMeshPtr.valid())
+    if (singleCellMeshPtr)
     {
         // On master call the agglomerator
-        const lduPrimitiveMesh& singleCellMesh = singleCellMeshPtr();
+        const lduPrimitiveMesh& singleCellMesh = *singleCellMeshPtr;
 
         label nCoarseProcs;
         fineToCoarse = pairGAMGAgglomeration::agglomerate
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 45a6afaacc..f3782b6aaa 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1837,7 +1837,7 @@ void Foam::globalMeshData::clearOut()
 
 const Foam::labelList& Foam::globalMeshData::sharedPointGlobalLabels() const
 {
-    if (!sharedPointGlobalLabelsPtr_.valid())
+    if (!sharedPointGlobalLabelsPtr_)
     {
         sharedPointGlobalLabelsPtr_.reset
         (
@@ -2015,7 +2015,7 @@ Foam::label Foam::globalMeshData::nGlobalPoints() const
 
 const Foam::labelList& Foam::globalMeshData::sharedPointLabels() const
 {
-    if (!sharedPointLabelsPtr_.valid())
+    if (!sharedPointLabelsPtr_)
     {
         calcSharedPoints();
     }
@@ -2025,7 +2025,7 @@ const Foam::labelList& Foam::globalMeshData::sharedPointLabels() const
 
 const Foam::labelList& Foam::globalMeshData::sharedPointAddr() const
 {
-    if (!sharedPointAddrPtr_.valid())
+    if (!sharedPointAddrPtr_)
     {
         calcSharedPoints();
     }
@@ -2045,7 +2045,7 @@ Foam::label Foam::globalMeshData::nGlobalEdges() const
 
 const Foam::labelList& Foam::globalMeshData::sharedEdgeLabels() const
 {
-    if (!sharedEdgeLabelsPtr_.valid())
+    if (!sharedEdgeLabelsPtr_)
     {
         calcSharedEdges();
     }
@@ -2055,7 +2055,7 @@ const Foam::labelList& Foam::globalMeshData::sharedEdgeLabels() const
 
 const Foam::labelList& Foam::globalMeshData::sharedEdgeAddr() const
 {
-    if (!sharedEdgeAddrPtr_.valid())
+    if (!sharedEdgeAddrPtr_)
     {
         calcSharedEdges();
     }
@@ -2065,7 +2065,7 @@ const Foam::labelList& Foam::globalMeshData::sharedEdgeAddr() const
 
 const Foam::indirectPrimitivePatch& Foam::globalMeshData::coupledPatch() const
 {
-    if (!coupledPatchPtr_.valid())
+    if (!coupledPatchPtr_)
     {
         const polyBoundaryMesh& bMesh = mesh_.boundaryMesh();
 
@@ -2126,7 +2126,7 @@ const Foam::indirectPrimitivePatch& Foam::globalMeshData::coupledPatch() const
 
 const Foam::labelList& Foam::globalMeshData::coupledPatchMeshEdges() const
 {
-    if (!coupledPatchMeshEdgesPtr_.valid())
+    if (!coupledPatchMeshEdgesPtr_)
     {
         coupledPatchMeshEdgesPtr_.reset
         (
@@ -2147,7 +2147,7 @@ const Foam::labelList& Foam::globalMeshData::coupledPatchMeshEdges() const
 const Foam::Map<Foam::label>& Foam::globalMeshData::coupledPatchMeshEdgeMap()
 const
 {
-    if (!coupledPatchMeshEdgeMapPtr_.valid())
+    if (!coupledPatchMeshEdgeMapPtr_)
     {
         const labelList& me = coupledPatchMeshEdges();
 
@@ -2165,7 +2165,7 @@ const
 
 const Foam::globalIndex& Foam::globalMeshData::globalPointNumbering() const
 {
-    if (!globalPointNumberingPtr_.valid())
+    if (!globalPointNumberingPtr_)
     {
         globalPointNumberingPtr_.reset
         (
@@ -2179,7 +2179,7 @@ const Foam::globalIndex& Foam::globalMeshData::globalPointNumbering() const
 const Foam::globalIndexAndTransform&
 Foam::globalMeshData::globalTransforms() const
 {
-    if (!globalTransformsPtr_.valid())
+    if (!globalTransformsPtr_)
     {
         globalTransformsPtr_.reset(new globalIndexAndTransform(mesh_));
     }
@@ -2189,7 +2189,7 @@ Foam::globalMeshData::globalTransforms() const
 
 const Foam::labelListList& Foam::globalMeshData::globalPointSlaves() const
 {
-    if (!globalPointSlavesPtr_.valid())
+    if (!globalPointSlavesPtr_)
     {
         calcGlobalPointSlaves();
     }
@@ -2200,7 +2200,7 @@ const Foam::labelListList& Foam::globalMeshData::globalPointSlaves() const
 const Foam::labelListList& Foam::globalMeshData::globalPointTransformedSlaves()
 const
 {
-    if (!globalPointTransformedSlavesPtr_.valid())
+    if (!globalPointTransformedSlavesPtr_)
     {
         calcGlobalPointSlaves();
     }
@@ -2210,7 +2210,7 @@ const
 
 const Foam::mapDistribute& Foam::globalMeshData::globalPointSlavesMap() const
 {
-    if (!globalPointSlavesMapPtr_.valid())
+    if (!globalPointSlavesMapPtr_)
     {
         calcGlobalPointSlaves();
     }
@@ -2220,7 +2220,7 @@ const Foam::mapDistribute& Foam::globalMeshData::globalPointSlavesMap() const
 
 const Foam::globalIndex& Foam::globalMeshData::globalEdgeNumbering() const
 {
-    if (!globalEdgeNumberingPtr_.valid())
+    if (!globalEdgeNumberingPtr_)
     {
         globalEdgeNumberingPtr_.reset
         (
@@ -2233,7 +2233,7 @@ const Foam::globalIndex& Foam::globalMeshData::globalEdgeNumbering() const
 
 const Foam::labelListList& Foam::globalMeshData::globalEdgeSlaves() const
 {
-    if (!globalEdgeSlavesPtr_.valid())
+    if (!globalEdgeSlavesPtr_)
     {
         calcGlobalEdgeSlaves();
     }
@@ -2244,7 +2244,7 @@ const Foam::labelListList& Foam::globalMeshData::globalEdgeSlaves() const
 const Foam::labelListList& Foam::globalMeshData::globalEdgeTransformedSlaves()
 const
 {
-    if (!globalEdgeTransformedSlavesPtr_.valid())
+    if (!globalEdgeTransformedSlavesPtr_)
     {
         calcGlobalEdgeSlaves();
     }
@@ -2254,7 +2254,7 @@ const
 
 const Foam::bitSet& Foam::globalMeshData::globalEdgeOrientation() const
 {
-    if (!globalEdgeOrientationPtr_.valid())
+    if (!globalEdgeOrientationPtr_)
     {
         calcGlobalEdgeOrientation();
     }
@@ -2264,7 +2264,7 @@ const Foam::bitSet& Foam::globalMeshData::globalEdgeOrientation() const
 
 const Foam::mapDistribute& Foam::globalMeshData::globalEdgeSlavesMap() const
 {
-    if (!globalEdgeSlavesMapPtr_.valid())
+    if (!globalEdgeSlavesMapPtr_)
     {
         calcGlobalEdgeSlaves();
     }
@@ -2275,7 +2275,7 @@ const Foam::mapDistribute& Foam::globalMeshData::globalEdgeSlavesMap() const
 const Foam::globalIndex& Foam::globalMeshData::globalBoundaryFaceNumbering()
 const
 {
-    if (!globalBoundaryFaceNumberingPtr_.valid())
+    if (!globalBoundaryFaceNumberingPtr_)
     {
         calcGlobalPointBoundaryFaces();
     }
@@ -2286,7 +2286,7 @@ const
 const Foam::labelListList& Foam::globalMeshData::globalPointBoundaryFaces()
 const
 {
-    if (!globalPointBoundaryFacesPtr_.valid())
+    if (!globalPointBoundaryFacesPtr_)
     {
         calcGlobalPointBoundaryFaces();
     }
@@ -2297,7 +2297,7 @@ const
 const Foam::labelListList&
 Foam::globalMeshData::globalPointTransformedBoundaryFaces() const
 {
-    if (!globalPointTransformedBoundaryFacesPtr_.valid())
+    if (!globalPointTransformedBoundaryFacesPtr_)
     {
         calcGlobalPointBoundaryFaces();
     }
@@ -2308,7 +2308,7 @@ Foam::globalMeshData::globalPointTransformedBoundaryFaces() const
 const Foam::mapDistribute& Foam::globalMeshData::globalPointBoundaryFacesMap()
 const
 {
-    if (!globalPointBoundaryFacesMapPtr_.valid())
+    if (!globalPointBoundaryFacesMapPtr_)
     {
         calcGlobalPointBoundaryFaces();
     }
@@ -2318,7 +2318,7 @@ const
 
 const Foam::labelList& Foam::globalMeshData::boundaryCells() const
 {
-    if (!boundaryCellsPtr_.valid())
+    if (!boundaryCellsPtr_)
     {
         calcGlobalPointBoundaryCells();
     }
@@ -2329,7 +2329,7 @@ const Foam::labelList& Foam::globalMeshData::boundaryCells() const
 const Foam::globalIndex& Foam::globalMeshData::globalBoundaryCellNumbering()
 const
 {
-    if (!globalBoundaryCellNumberingPtr_.valid())
+    if (!globalBoundaryCellNumberingPtr_)
     {
         calcGlobalPointBoundaryCells();
     }
@@ -2340,7 +2340,7 @@ const
 const Foam::labelListList& Foam::globalMeshData::globalPointBoundaryCells()
 const
 {
-    if (!globalPointBoundaryCellsPtr_.valid())
+    if (!globalPointBoundaryCellsPtr_)
     {
         calcGlobalPointBoundaryCells();
     }
@@ -2351,7 +2351,7 @@ const
 const Foam::labelListList&
 Foam::globalMeshData::globalPointTransformedBoundaryCells() const
 {
-    if (!globalPointTransformedBoundaryCellsPtr_.valid())
+    if (!globalPointTransformedBoundaryCellsPtr_)
     {
         calcGlobalPointBoundaryCells();
     }
@@ -2362,7 +2362,7 @@ Foam::globalMeshData::globalPointTransformedBoundaryCells() const
 const Foam::mapDistribute& Foam::globalMeshData::globalPointBoundaryCellsMap()
 const
 {
-    if (!globalPointBoundaryCellsMapPtr_.valid())
+    if (!globalPointBoundaryCellsMapPtr_)
     {
         calcGlobalPointBoundaryCells();
     }
@@ -2372,7 +2372,7 @@ const
 
 const Foam::labelListList& Foam::globalMeshData::globalCoPointSlaves() const
 {
-    if (!globalCoPointSlavesPtr_.valid())
+    if (!globalCoPointSlavesPtr_)
     {
         calcGlobalCoPointSlaves();
     }
@@ -2382,7 +2382,7 @@ const Foam::labelListList& Foam::globalMeshData::globalCoPointSlaves() const
 
 const Foam::mapDistribute& Foam::globalMeshData::globalCoPointSlavesMap() const
 {
-    if (!globalCoPointSlavesMapPtr_.valid())
+    if (!globalCoPointSlavesMapPtr_)
     {
         calcGlobalCoPointSlaves();
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
index c187887427..a7b8f955a5 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -645,7 +646,7 @@ public:
 
                 bool hasOldCellVolumes() const
                 {
-                    return oldCellVolumesPtr_.valid();
+                    return bool(oldCellVolumesPtr_);
                 }
 
                 const scalarField& oldCellVolumes() const
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 71f84b929a..ec523bc956 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -329,7 +329,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
             << " boundaries." << endl;
     }
 
-    if (!neighbourEdgesPtr_.valid())
+    if (!neighbourEdgesPtr_)
     {
         neighbourEdgesPtr_.reset(new List<labelPairList>(size()));
         List<labelPairList>& neighbourEdges = neighbourEdgesPtr_();
@@ -451,7 +451,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
 
 const Foam::labelList& Foam::polyBoundaryMesh::patchID() const
 {
-    if (!patchIDPtr_.valid())
+    if (!patchIDPtr_)
     {
         patchIDPtr_.reset(new labelList(mesh_.nBoundaryFaces()));
         labelList& list = *patchIDPtr_;
@@ -476,7 +476,7 @@ const Foam::labelList& Foam::polyBoundaryMesh::patchID() const
 const Foam::HashTable<Foam::labelList>&
 Foam::polyBoundaryMesh::groupPatchIDs() const
 {
-    if (!groupPatchIDsPtr_.valid())
+    if (!groupPatchIDsPtr_)
     {
         groupPatchIDsPtr_.reset(new HashTable<labelList>(16));
         auto& groupPatchIDs = *groupPatchIDsPtr_;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index b81813c293..81fcd21f7f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -699,25 +699,25 @@ void Foam::polyMesh::resetPrimitives
 
     // Take over new primitive data.
     // Optimized to avoid overwriting data at all
-    if (points.valid())
+    if (points)
     {
-        points_.transfer(points());
+        points_.transfer(*points);
         bounds_ = boundBox(points_, validBoundary);
     }
 
-    if (faces.valid())
+    if (faces)
     {
-        faces_.transfer(faces());
+        faces_.transfer(*faces);
     }
 
-    if (owner.valid())
+    if (owner)
     {
-        owner_.transfer(owner());
+        owner_.transfer(*owner);
     }
 
-    if (neighbour.valid())
+    if (neighbour)
     {
-        neighbour_.transfer(neighbour());
+        neighbour_.transfer(*neighbour);
     }
 
 
@@ -922,7 +922,7 @@ Foam::polyMesh::cellTree() const
         );
     }
 
-    return cellTreePtr_();
+    return *cellTreePtr_;
 }
 
 
@@ -1160,11 +1160,11 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
     points_.instance() = time().timeName();
     points_.eventNo() = getEvent();
 
-    if (tetBasePtIsPtr_.valid())
+    if (tetBasePtIsPtr_)
     {
-        tetBasePtIsPtr_().writeOpt() = IOobject::AUTO_WRITE;
-        tetBasePtIsPtr_().instance() = time().timeName();
-        tetBasePtIsPtr_().eventNo() = getEvent();
+        tetBasePtIsPtr_->writeOpt() = IOobject::AUTO_WRITE;
+        tetBasePtIsPtr_->instance() = time().timeName();
+        tetBasePtIsPtr_->eventNo() = getEvent();
     }
 
     tmp<scalarField> sweptVols = primitiveMesh::movePoints
@@ -1174,9 +1174,9 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
     );
 
     // Adjust parallel shared points
-    if (globalMeshDataPtr_.valid())
+    if (globalMeshDataPtr_)
     {
-        globalMeshDataPtr_().movePoints(points_);
+        globalMeshDataPtr_->movePoints(points_);
     }
 
     // Force recalculation of all geometric data with new points
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
index 123a95741a..e23cf5edc1 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
@@ -80,7 +80,7 @@ void Foam::polyMesh::updateGeom
     DebugInFunction
         << "Updating geometric data with newPoints:"
         << newPoints.size() << " newTetBasePtIs:"
-        << newTetBasePtIsPtr.valid() << endl;
+        << bool(newTetBasePtIsPtr) << endl;
 
     if (points_.size() != 0 && points_.size() != newPoints.size())
     {
@@ -128,7 +128,7 @@ void Foam::polyMesh::updateGeom
     points_.transfer(newPoints);
 
     // Optional new tet base points
-    if (newTetBasePtIsPtr.valid())
+    if (newTetBasePtIsPtr)
     {
         tetBasePtIsPtr_ = std::move(newTetBasePtIsPtr);
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 0789ee7acc..0ba633b8f0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -64,7 +64,7 @@ void Foam::polyMesh::setInstance
     cellZones_.writeOpt() = wOpt;
     cellZones_.instance() = inst;
 
-    if (tetBasePtIsPtr_.valid())
+    if (tetBasePtIsPtr_)
     {
         tetBasePtIsPtr_->writeOpt() = wOpt;
         tetBasePtIsPtr_->instance() = inst;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
index e5818171d5..65e7152c2a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
@@ -59,7 +59,7 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
     cellTreePtr_.clear();
 
     // Update parallel data
-    if (globalMeshDataPtr_.valid())
+    if (globalMeshDataPtr_)
     {
         globalMeshDataPtr_->updateMesh();
     }
@@ -67,12 +67,12 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
     setInstance(time().timeName());
 
     // Map the old motion points if present
-    if (oldPointsPtr_.valid())
+    if (oldPointsPtr_)
     {
         // Make a copy of the original points
-        pointField oldMotionPoints = oldPointsPtr_();
+        pointField oldMotionPoints = *oldPointsPtr_;
 
-        pointField& newMotionPoints = oldPointsPtr_();
+        pointField& newMotionPoints = *oldPointsPtr_;
 
         // Resize the list to new size
         newMotionPoints.setSize(points_.size());
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index b8d5ebfa3c..46b2792a76 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -528,7 +528,7 @@ void Foam::processorPolyPatch::updateMesh(PstreamBuffers& pBufs)
 
 const Foam::labelList& Foam::processorPolyPatch::neighbPoints() const
 {
-    if (!neighbPointsPtr_.valid())
+    if (!neighbPointsPtr_)
     {
         FatalErrorInFunction
             << "No extended addressing calculated for patch " << name()
@@ -540,7 +540,7 @@ const Foam::labelList& Foam::processorPolyPatch::neighbPoints() const
 
 const Foam::labelList& Foam::processorPolyPatch::neighbEdges() const
 {
-    if (!neighbEdgesPtr_.valid())
+    if (!neighbEdgesPtr_)
     {
         FatalErrorInFunction
             << "No extended addressing calculated for patch " << name()
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
index bbb0e4d0c7..ab153b6641 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
@@ -224,7 +224,7 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correctInletOutlet
 template<class BasicTurbulenceModel>
 void mixtureKEpsilon<BasicTurbulenceModel>::initMixtureFields()
 {
-    if (rhom_.valid()) return;
+    if (rhom_) return;
 
     // Local references to gas-phase properties
     const volScalarField& kg = this->k_;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
index bf82722232..55e412cf02 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.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.
@@ -227,7 +227,7 @@ template<class Type>
 const Foam::fvPatchField<Type>&
 Foam::codedFixedValueFvPatchField<Type>::redirectPatchField() const
 {
-    if (!redirectPatchFieldPtr_.valid())
+    if (!redirectPatchFieldPtr_)
     {
         // Construct a patch
         // Make sure to construct the patchfield with up-to-date value
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C
index ad721c0b37..96e11f9f4e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.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.
@@ -226,7 +226,7 @@ template<class Type>
 const Foam::mixedFvPatchField<Type>&
 Foam::codedMixedFvPatchField<Type>::redirectPatchField() const
 {
-    if (!redirectPatchFieldPtr_.valid())
+    if (!redirectPatchFieldPtr_)
     {
         // Construct a patch
         // Make sure to construct the patchfield with up-to-date value
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index a0a4e59be7..b9bbdedf81 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,7 +132,7 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
     origin_(ptf.origin_)
 {
     // Evaluate the profile if defined
-    if (ptf.profile_.valid())
+    if (ptf.profile_)
     {
         this->evaluate();
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
index 1cfd48f0df..eed403c590 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
@@ -102,7 +102,7 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
     inletOutletFvPatchField<Type>(ptf, p, iF, mapper),
     freestreamBCPtr_()
 {
-    if (ptf.freestreamBCPtr_.valid())
+    if (ptf.freestreamBCPtr_)
     {
         freestreamBCPtr_ =
             fvPatchField<Type>::New(ptf.freestreamBCPtr_(), p, iF, mapper);
@@ -119,7 +119,7 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
     inletOutletFvPatchField<Type>(ptf),
     freestreamBCPtr_()
 {
-    if (ptf.freestreamBCPtr_.valid())
+    if (ptf.freestreamBCPtr_)
     {
         freestreamBCPtr_ = ptf.freestreamBCPtr_->clone();
     }
@@ -136,7 +136,7 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
     inletOutletFvPatchField<Type>(ptf, iF),
     freestreamBCPtr_()
 {
-    if (ptf.freestreamBCPtr_.valid())
+    if (ptf.freestreamBCPtr_)
     {
         freestreamBCPtr_ = ptf.freestreamBCPtr_->clone();
     }
@@ -149,7 +149,7 @@ template<class Type>
 void Foam::freestreamFvPatchField<Type>::autoMap(const fvPatchFieldMapper& m)
 {
     inletOutletFvPatchField<Type>::autoMap(m);
-    if (freestreamBCPtr_.valid())
+    if (freestreamBCPtr_)
     {
         freestreamBCPtr_->autoMap(m);
     }
@@ -167,7 +167,7 @@ void Foam::freestreamFvPatchField<Type>::rmap
 
     const auto& fsptf = refCast<const freestreamFvPatchField<Type>>(ptf);
 
-    if (fsptf.freestreamBCPtr_.valid())
+    if (fsptf.freestreamBCPtr_)
     {
         freestreamBCPtr_->rmap(fsptf.freestreamBCPtr_(), addr);
     }
@@ -182,7 +182,7 @@ void Foam::freestreamFvPatchField<Type>::updateCoeffs()
         return;
     }
 
-    if (freestreamBCPtr_.valid())
+    if (freestreamBCPtr_)
     {
         freestreamBCPtr_->evaluate();
         freestreamValue() = freestreamBCPtr_();
@@ -198,7 +198,7 @@ void Foam::freestreamFvPatchField<Type>::write(Ostream& os) const
     fvPatchField<Type>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", this->phiName_);
 
-    if (freestreamBCPtr_.valid())
+    if (freestreamBCPtr_)
     {
         os.beginBlock("freestreamBC");
         freestreamBCPtr_->write(os);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index e82228b7ae..a2ee30027a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -107,7 +107,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
     uniformGradient_(ptf.uniformGradient_.clone())
 {
     // Evaluate the profile if defined
-    if (ptf.uniformGradient_.valid())
+    if (ptf.uniformGradient_)
     {
         this->evaluate();
     }
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
index ccc3c31375..bfc8baadda 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
@@ -399,9 +399,9 @@ combineSurfaceGeometry
             points = s.points();
         }
     }
-    else if (sampledPtr_.valid())
+    else if (sampledPtr_)
     {
-        const sampledSurface& s = sampledPtr_();
+        const sampledSurface& s = *sampledPtr_;
 
         if (Pstream::parRun())
         {
@@ -443,9 +443,9 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::totalArea() const
 
         totalArea = gSum(s.magSf());
     }
-    else if (sampledPtr_.valid())
+    else if (sampledPtr_)
     {
-        totalArea = gSum(sampledPtr_().magSf());
+        totalArea = gSum(sampledPtr_->magSf());
     }
     else
     {
@@ -482,7 +482,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::usesSf() const
 
 bool Foam::functionObjects::fieldValues::surfaceFieldValue::update()
 {
-    if (sampledPtr_.valid())
+    if (sampledPtr_)
     {
         sampledPtr_->update();
     }
@@ -1022,9 +1022,9 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
             const polySurface& s = dynamicCast<const polySurface>(obr());
             Sf = s.Sf();
         }
-        else if (sampledPtr_.valid())
+        else if (sampledPtr_)
         {
-            Sf = sampledPtr_().Sf();
+            Sf = sampledPtr_->Sf();
         }
         else
         {
@@ -1036,7 +1036,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
     faceList faces;
     pointField points;
 
-    if (surfaceWriterPtr_.valid())
+    if (surfaceWriterPtr_)
     {
         if (withTopologicalMerge())
         {
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
index 8d136cc7af..51fb11bf99 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
@@ -94,19 +94,19 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::getFieldValues
     {
         const vf& fld = lookupObject<vf>(fieldName);
 
-        if (sampledPtr_.valid())
+        if (sampledPtr_)
         {
-            if (sampledPtr_().interpolate())
+            if (sampledPtr_->interpolate())
             {
                 const interpolationCellPoint<Type> interp(fld);
 
-                return sampledPtr_().interpolate(interp);
+                return sampledPtr_->interpolate(interp);
             }
             else
             {
                 const interpolationCell<Type> interp(fld);
 
-                return sampledPtr_().sample(interp);
+                return sampledPtr_->sample(interp);
             }
         }
         else
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index d5c2ee726f..bb0f702dc5 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -903,7 +903,7 @@ bool Foam::functionObjects::regionSizeDistribution::write()
                     volVectorField
                 >(fldName).primitiveField();
 
-                if (csysPtr_.valid())
+                if (csysPtr_)
                 {
                     Log << "Transforming vector field " << fldName
                         << " with coordinate system "
diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
index d96810f03b..0b58ed947a 100644
--- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
+++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
@@ -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.
@@ -144,7 +144,7 @@ Foam::functionObjects::codedFunctionObject::codedFunctionObject
 Foam::functionObject&
 Foam::functionObjects::codedFunctionObject::redirectFunctionObject() const
 {
-    if (!redirectFunctionObjectPtr_.valid())
+    if (!redirectFunctionObjectPtr_)
     {
         dictionary constructDict(dict_);
         constructDict.set("type", name_);
diff --git a/src/functionObjects/utilities/ensightWrite/ensightWrite.C b/src/functionObjects/utilities/ensightWrite/ensightWrite.C
index ebf3277e36..7131e34fc6 100644
--- a/src/functionObjects/utilities/ensightWrite/ensightWrite.C
+++ b/src/functionObjects/utilities/ensightWrite/ensightWrite.C
@@ -189,7 +189,7 @@ bool Foam::functionObjects::ensightWrite::execute()
 
 bool Foam::functionObjects::ensightWrite::write()
 {
-    if (!ensCase_.valid())
+    if (!ensCase_)
     {
         ensCase_.reset
         (
diff --git a/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C b/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C
index 4826d96236..7898063c97 100644
--- a/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C
+++ b/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.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.
@@ -146,7 +146,7 @@ bool Foam::functionObjects::ensightWrite::update()
     //     ensMesh_.clear();
     //     meshSubset_.clear();
     // }
-    // else if (ensMesh_.valid())
+    // else if (ensMesh_)
     // {
     //     ensMesh_->expire();
     // }
@@ -157,13 +157,13 @@ bool Foam::functionObjects::ensightWrite::update()
 
     meshState_ = polyMesh::UNCHANGED;
 
-    if (!ensMesh_.valid())
+    if (!ensMesh_)
     {
         ensMesh_.reset(new ensightMesh(meshSubset_.mesh(), writeOpts_));
     }
-    else if (ensMesh_().needsUpdate())
+    else if (ensMesh_->needsUpdate())
     {
-        ensMesh_().correct();
+        ensMesh_->correct();
     }
 
     return true;
diff --git a/src/functionObjects/utilities/vtkWrite/vtkWrite.C b/src/functionObjects/utilities/vtkWrite/vtkWrite.C
index fb18af2dac..7eaeb707fe 100644
--- a/src/functionObjects/utilities/vtkWrite/vtkWrite.C
+++ b/src/functionObjects/utilities/vtkWrite/vtkWrite.C
@@ -521,7 +521,7 @@ bool Foam::functionObjects::vtkWrite::write()
 
         // CellData
         {
-            if (internalWriter.valid())
+            if (internalWriter)
             {
                 // Optionally with cellID and procID fields
                 internalWriter->beginCellData
@@ -580,7 +580,7 @@ bool Foam::functionObjects::vtkWrite::write()
         if (interpolate_)
         {
             // Begin PointData
-            if (internalWriter.valid())
+            if (internalWriter)
             {
                 internalWriter->beginPointData
                 (
@@ -631,7 +631,7 @@ bool Foam::functionObjects::vtkWrite::write()
 
 
         // Finish writers
-        if (internalWriter.valid())
+        if (internalWriter)
         {
             internalWriter->close();
         }
diff --git a/src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C b/src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C
index 1528db7951..b46a302462 100644
--- a/src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C
+++ b/src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C
@@ -54,7 +54,7 @@ Foam::label Foam::functionObjects::vtkWrite::writeVolFields
         const auto& field = tfield();
 
         // Internal
-        if (internalWriter.valid())
+        if (internalWriter)
         {
             ok = true;
             internalWriter->write(field);
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
index 5d14c7b9e4..4d3c735d21 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
@@ -145,7 +145,7 @@ Foam::displacementComponentLaplacianFvMotionSolver::curPoints() const
         pointDisplacement_
     );
 
-    if (pointLocation_.valid())
+    if (pointLocation_)
     {
         if (debug)
         {
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index 7b23d26379..f7e53f1883 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2016 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -245,7 +245,7 @@ Foam::displacementLaplacianFvMotionSolver::
 Foam::motionDiffusivity&
 Foam::displacementLaplacianFvMotionSolver::diffusivity()
 {
-    if (!diffusivityPtr_.valid())
+    if (!diffusivityPtr_)
     {
         diffusivityPtr_ = motionDiffusivity::New
         (
@@ -267,7 +267,7 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const
         pointDisplacement_
     );
 
-    if (pointLocation_.valid())
+    if (pointLocation_)
     {
         if (debug)
         {
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C
index c85279c7e1..7861c2215e 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -249,7 +249,7 @@ Foam::solidBodyDisplacementLaplacianFvMotionSolver::
 Foam::motionDiffusivity&
 Foam::solidBodyDisplacementLaplacianFvMotionSolver::diffusivity()
 {
-    if (!diffusivityPtr_.valid())
+    if (!diffusivityPtr_)
     {
         diffusivityPtr_ = motionDiffusivity::New
         (
@@ -277,7 +277,7 @@ Foam::solidBodyDisplacementLaplacianFvMotionSolver::curPoints() const
     );
     const pointField& newPoints = tnewPoints();
 
-    if (pointLocation_.valid())
+    if (pointLocation_)
     {
         if (debug)
         {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index eecf949253..4b5921345e 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -591,7 +591,7 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::updateCoeffs()
     }
 
     // Apply offset to mapped values
-    if (offset_.valid())
+    if (offset_)
     {
         const scalar t = this->db().time().timeOutputValue();
         this->operator==(*this + offset_->value(t));
@@ -633,7 +633,7 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::write
         mapMethod_
     );
 
-    if (offset_.valid())
+    if (offset_)
     {
         offset_->writeData(os);
     }
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
index 97944dc7ab..61c6e0a1c0 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -155,7 +155,7 @@ void uniformInterpolatedDisplacementPointPatchVectorField::updateCoeffs()
         return;
     }
 
-    if (!interpolatorPtr_.valid())
+    if (!interpolatorPtr_)
     {
         interpolatorPtr_ = interpolationWeights::New
         (
diff --git a/src/fvOptions/interRegionOption/interRegionOptionI.H b/src/fvOptions/interRegionOption/interRegionOptionI.H
index 5c6e571dbf..556a8db27f 100644
--- a/src/fvOptions/interRegionOption/interRegionOptionI.H
+++ b/src/fvOptions/interRegionOption/interRegionOptionI.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2015 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,7 +38,7 @@ Foam::fv::interRegionOption::nbrRegionName() const
 inline const Foam::meshToMesh&
 Foam::fv::interRegionOption::meshInterp() const
 {
-    if (!meshInterpPtr_.valid())
+    if (!meshInterpPtr_)
     {
         FatalErrorInFunction
             << "Interpolation object not set"
diff --git a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C
index 761b975d59..78c16a65d4 100644
--- a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C
+++ b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -95,7 +95,7 @@ Foam::fv::jouleHeatingSource::updateSigma
     VolFieldType& sigma =
         mesh_.lookupObjectRef<VolFieldType>(typeName + ":sigma");
 
-    if (!sigmaVsTPtr.valid())
+    if (!sigmaVsTPtr)
     {
         // Electrical conductivity field, sigma, was specified by the user
         return sigma;
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
index a623cbe1ea..5a050a7053 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ void Foam::fv::rotorDiskSource::calculate
     scalar AOAmax = -GREAT;
 
     // Cached position-dependent rotations available?
-    const bool hasCache = Rcyl_.valid();
+    const bool hasCache = bool(Rcyl_);
 
     forAll(cells_, i)
     {
diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.C b/src/fvOptions/sources/general/codedSource/CodedSource.C
index 9998e8a8b7..0718578487 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSource.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSource.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -134,7 +134,7 @@ Foam::fv::CodedSource<Type>::CodedSource
 template<class Type>
 Foam::fv::option& Foam::fv::CodedSource<Type>::redirectFvOption() const
 {
-    if (!redirectFvOptionPtr_.valid())
+    if (!redirectFvOptionPtr_)
     {
         dictionary constructDict(dict_);
         constructDict.set("type", name_);
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H
index 709fe921d4..419854da57 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,7 +38,7 @@ Foam::fv::interRegionHeatTransferModel::nbrRegionName() const
 inline const Foam::meshToMesh&
 Foam::fv::interRegionHeatTransferModel::meshInterp() const
 {
-    if (!meshInterpPtr_.valid())
+    if (!meshInterpPtr_)
     {
         FatalErrorInFunction
             << "Interpolation object not set"
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
index a613e44829..69d68c1843 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
@@ -51,7 +51,7 @@ namespace fv
 const Foam::interpolation2DTable<Foam::scalar>&
 Foam::fv::tabulatedHeatTransfer::hTable()
 {
-    if (!hTable_.valid())
+    if (!hTable_)
     {
         hTable_.reset(new interpolation2DTable<scalar>(coeffs_));
     }
@@ -62,7 +62,7 @@ Foam::fv::tabulatedHeatTransfer::hTable()
 
 const Foam::volScalarField& Foam::fv::tabulatedHeatTransfer::AoV()
 {
-    if (!AoV_.valid())
+    if (!AoV_)
     {
         AoV_.reset
         (
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
index eccd89663c..8ae0a1940b 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
@@ -61,7 +61,7 @@ Foam::fv::tabulatedNTUHeatTransfer::geometryModelNames_
 const Foam::interpolation2DTable<Foam::scalar>&
 Foam::fv::tabulatedNTUHeatTransfer::ntuTable()
 {
-    if (!ntuTable_.valid())
+    if (!ntuTable_)
     {
         ntuTable_.reset(new interpolation2DTable<scalar>(coeffs_));
     }
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index ac8df21394..6ac60ed4df 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.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.
@@ -343,7 +344,7 @@ void Foam::Cloud<ParticleType>::move
 template<class ParticleType>
 void Foam::Cloud<ParticleType>::autoMap(const mapPolyMesh& mapper)
 {
-    if (!globalPositionsPtr_.valid())
+    if (!globalPositionsPtr_)
     {
         FatalErrorInFunction
             << "Global positions are not available. "
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 0dedfa1e90..e1b91f5488 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -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.
@@ -343,7 +343,7 @@ void Foam::ReactingCloud<CloudType>::info()
 template<class CloudType>
 void Foam::ReactingCloud<CloudType>::writeFields() const
 {
-    if (compositionModel_.valid())
+    if (compositionModel_)
     {
         CloudType::particleType::writeFields(*this, this->composition());
     }
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index ef6a2595d8..0035a7c29a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.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.
@@ -279,7 +280,7 @@ void Foam::ReactingMultiphaseCloud<CloudType>::info()
 template<class CloudType>
 void Foam::ReactingMultiphaseCloud<CloudType>::writeFields() const
 {
-    if (this->compositionModel_.valid())
+    if (this->compositionModel_)
     {
         CloudType::particleType::writeFields(*this, this->composition());
     }
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
index d63c4771a3..3879e1248d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -123,7 +124,7 @@ template<class ParcelType>
 inline const Foam::interpolation<Foam::scalar>&
 Foam::ThermoParcel<ParcelType>::trackingData::GInterp() const
 {
-    if (!GInterp_.valid())
+    if (!GInterp_)
     {
         FatalErrorInFunction
             << "Radiation G interpolation object not set"
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index 3764a682ac..351160e305 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -447,7 +447,7 @@ void Foam::ParticleCollector<CloudType>::write()
         sumTotalMass += faceMassTotal[facei];
         sumAverageMFR += faceMassFlowRate[facei];
 
-        if (outputFilePtr_.valid())
+        if (outputFilePtr_)
         {
             outputFilePtr_()
                 << time.timeName()
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
index a0aaae3202..228ee73c2c 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
@@ -33,7 +33,7 @@ License
 template<class CloudType>
 void Foam::ParticleErosion<CloudType>::resetQ()
 {
-    if (QPtr_.valid())
+    if (QPtr_)
     {
         QPtr_->primitiveFieldRef() = 0.0;
     }
@@ -82,7 +82,7 @@ Foam::label Foam::ParticleErosion<CloudType>::applyToPatch
 template<class CloudType>
 void Foam::ParticleErosion<CloudType>::write()
 {
-    if (QPtr_.valid())
+    if (QPtr_)
     {
         QPtr_->write();
     }
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
index 52f75c099a..2d34c57eb2 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
@@ -36,7 +36,7 @@ License
 template<class CloudType>
 void Foam::ParticleTracks<CloudType>::write()
 {
-    if (cloudPtr_.valid())
+    if (cloudPtr_)
     {
         cloudPtr_->write();
 
@@ -94,7 +94,7 @@ void Foam::ParticleTracks<CloudType>::preEvolve
     const typename parcelType::trackingData& td
 )
 {
-    if (!cloudPtr_.valid())
+    if (!cloudPtr_)
     {
         cloudPtr_.reset
         (
@@ -113,10 +113,10 @@ void Foam::ParticleTracks<CloudType>::postFace(const parcelType& p, bool&)
      || this->owner().solution().transient()
     )
     {
-        if (!cloudPtr_.valid())
+        if (!cloudPtr_)
         {
             FatalErrorInFunction
-             << "Cloud storage not allocated" << abort(FatalError);
+                << "Cloud storage not allocated" << abort(FatalError);
         }
 
         const label count =
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
index 6e4f0b4d2f..e2f8938488 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
@@ -81,9 +81,9 @@ void Foam::ParticleTrap<CloudType>::preEvolve
         alphaPtr_ = &alpha;
     }
 
-    if (gradAlphaPtr_.valid())
+    if (gradAlphaPtr_)
     {
-        gradAlphaPtr_() == fvc::grad(*alphaPtr_);
+        *gradAlphaPtr_ == fvc::grad(*alphaPtr_);
     }
     else
     {
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C
index 67028c47e6..0c24a4c8d2 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C
@@ -33,7 +33,7 @@ License
 template<class CloudType>
 void Foam::VoidFraction<CloudType>::write()
 {
-    if (thetaPtr_.valid())
+    if (thetaPtr_)
     {
         thetaPtr_->write();
     }
@@ -79,7 +79,7 @@ void Foam::VoidFraction<CloudType>::preEvolve
     const typename parcelType::trackingData& td
 )
 {
-    if (thetaPtr_.valid())
+    if (thetaPtr_)
     {
         thetaPtr_->primitiveFieldRef() = 0.0;
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H
index 235444db28..ff50aa78c3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2015 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +32,7 @@ template<class CloudType>
 inline const Foam::interpolation<Foam::vector>&
 Foam::LiftForce<CloudType>::curlUcInterp() const
 {
-    if (!curlUcInterpPtr_.valid())
+    if (!curlUcInterpPtr_)
     {
         FatalErrorInFunction
             << "Carrier phase curlUc interpolation object not set"
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H
index 208f7aea71..59eca25992 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.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.
@@ -31,7 +32,7 @@ template<class CloudType>
 inline const Foam::interpolation<Foam::vector>&
 Foam::PressureGradientForce<CloudType>::DUcDtInterp() const
 {
-    if (!DUcDtInterpPtr_.valid())
+    if (!DUcDtInterpPtr_)
     {
         FatalErrorInFunction
             << "Carrier phase DUcDt interpolation object not set"
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 7b8b37f2b4..5ac43c4ade 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -154,7 +154,7 @@ Foam::LocalInteraction<CloudType>::LocalInteraction
 template<class CloudType>
 Foam::volScalarField& Foam::LocalInteraction<CloudType>::massEscape()
 {
-    if (!massEscapePtr_.valid())
+    if (!massEscapePtr_)
     {
         const fvMesh& mesh = this->owner().mesh();
 
@@ -183,7 +183,7 @@ Foam::volScalarField& Foam::LocalInteraction<CloudType>::massEscape()
 template<class CloudType>
 Foam::volScalarField& Foam::LocalInteraction<CloudType>::massStick()
 {
-    if (!massStickPtr_.valid())
+    if (!massStickPtr_)
     {
         const fvMesh& mesh = this->owner().mesh();
 
diff --git a/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.C b/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.C
index 2575b67303..08fa1186a5 100644
--- a/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.C
+++ b/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -181,7 +182,7 @@ Foam::projectCurveEdge::position(const scalarList& lambdas) const
                 points.last() = endPt;
             }
 
-            if (debugStr.valid())
+            if (debugStr)
             {
                 forAll(points, i)
                 {
@@ -241,7 +242,7 @@ Foam::projectCurveEdge::position(const scalarList& lambdas) const
         }
 
 
-        if (debugStr.valid())
+        if (debugStr)
         {
             forAll(points, i)
             {
diff --git a/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.C b/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.C
index 904468a72a..8259bc77ed 100644
--- a/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.C
+++ b/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -193,7 +194,7 @@ Foam::projectEdge::position(const scalarList& lambdas) const
                 points.last() = endPt;
             }
 
-            if (debugStr.valid())
+            if (debugStr)
             {
                 forAll(points, i)
                 {
@@ -253,7 +254,7 @@ Foam::projectEdge::position(const scalarList& lambdas) const
         }
 
 
-        if (debugStr.valid())
+        if (debugStr)
         {
             forAll(points, i)
             {
diff --git a/src/mesh/blockMesh/blockFaces/projectFace/projectFace.C b/src/mesh/blockMesh/blockFaces/projectFace/projectFace.C
index 20257f28ba..7ba567067f 100644
--- a/src/mesh/blockMesh/blockFaces/projectFace/projectFace.C
+++ b/src/mesh/blockMesh/blockFaces/projectFace/projectFace.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -231,7 +231,7 @@ void Foam::blockFaces::projectFace::project
                 if (hits[i].hit())
                 {
                     const point& hitPt = hits[i].hitPoint();
-                    if (debugStr.valid())
+                    if (debugStr)
                     {
                         debugStr().write(linePointRef(points[i], hitPt));
                     }
@@ -299,7 +299,7 @@ void Foam::blockFaces::projectFace::project
             }
         }
 
-        if (debugStr.valid())
+        if (debugStr)
         {
             forAll(points, i)
             {
@@ -351,7 +351,7 @@ void Foam::blockFaces::projectFace::project
             }
         }
 
-        if (debugStr.valid())
+        if (debugStr)
         {
             forAll(points, i)
             {
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
index 09582d62f0..eca9d82661 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2015 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -69,7 +70,7 @@ Foam::displacementMeshMoverMotionSolver::
 Foam::externalDisplacementMeshMover&
 Foam::displacementMeshMoverMotionSolver::meshMover() const
 {
-    if (!meshMoverPtr_.valid())
+    if (!meshMoverPtr_)
     {
         const word moverType(coeffDict().get<word>("meshMover"));
 
@@ -122,7 +123,7 @@ void Foam::displacementMeshMoverMotionSolver::movePoints(const pointField& p)
     displacementMotionSolver::movePoints(p);
 
     // Update meshMover for new geometry
-    if (meshMoverPtr_.valid())
+    if (meshMoverPtr_)
     {
         meshMover().movePoints(p);
     }
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index 86d8d81f6f..d58a1ea962 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -1555,12 +1555,12 @@ void Foam::medialAxisMeshMover::calculateDisplacement
                     numThicknessRatioExclude++;
                 }
 
-                if (str.valid())
+                if (str)
                 {
                     const point& pt = mesh().points()[pointI];
                     str().write(linePointRef(pt, pt+patchDisp[patchPointI]));
                 }
-                if (medialVecStr.valid())
+                if (medialVecStr)
                 {
                     const point& pt = mesh().points()[pointI];
                     medialVecStr().write
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 6b99d7ac69..595801c8e0 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -2926,7 +2926,7 @@ void Foam::meshRefinement::distribute(const mapDistributePolyMesh& map)
                 pointMap
             );
 
-            if (faceMap.valid())
+            if (faceMap)
             {
                 // (ab)use the instance() to signal current modification time
                 geometry[i].instance() = geometry[i].time().timeName();
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index f6db6804bf..d9af3f11ee 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -257,7 +257,7 @@ void Foam::meshRefinement::getIntersections
 
         if (hit1[i].hit() && hit2[i].hit())
         {
-            if (str.valid())
+            if (str)
             {
                 str().write(linePointRef(start[i], hit1[i].rawPoint()));
                 str().write
diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
index 8f74949036..4e5edc5ea3 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
@@ -416,7 +416,7 @@ void Foam::refinementFeatures::findHigherLevel
 const Foam::PtrList<Foam::indexedOctree<Foam::treeDataEdge>>&
 Foam::refinementFeatures::regionEdgeTrees() const
 {
-    if (!regionEdgeTreesPtr_.valid())
+    if (!regionEdgeTreesPtr_)
     {
         regionEdgeTreesPtr_.reset
         (
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 386e4d42e0..5c5a91e448 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2015-2019 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -834,7 +834,7 @@ void Foam::snappyLayerDriver::handleFeatureAngle
 
                     nFeats++;
 
-                    if (str.valid())
+                    if (str)
                     {
                         const point& p0 = pp.localPoints()[e[0]];
                         const point& p1 = pp.localPoints()[e[1]];
@@ -3341,9 +3341,9 @@ void Foam::snappyLayerDriver::addLayers
     // be done by snapping phase
     {
         autoPtr<mapPolyMesh> map = meshRefiner_.dupNonManifoldBoundaryPoints();
-        if (map.valid())
+        if (map)
         {
-            const labelList& reverseFaceMap = map().reverseFaceMap();
+            const labelList& reverseFaceMap = map->reverseFaceMap();
             forAll(baffles, i)
             {
                 label f0 = reverseFaceMap[baffles[i].first()];
@@ -3538,7 +3538,7 @@ void Foam::snappyLayerDriver::addLayers
             regionSide
         );
 
-        if (map.valid())
+        if (map)
         {
             // Store point duplication
             pointToMaster.setSize(mesh.nPoints(), -1);
@@ -4530,7 +4530,7 @@ void Foam::snappyLayerDriver::addLayers
 
 
         autoPtr<mapPolyMesh> map = meshRefiner_.mergePoints(pointToMaster);
-        if (map.valid())
+        if (map)
         {
             inplaceReorder(map().reverseCellMap(), cellNLayers);
 
@@ -4554,7 +4554,7 @@ void Foam::snappyLayerDriver::addLayers
             true,   // internal zones
             false   // baffle zones
         );
-        if (map.valid())
+        if (map)
         {
             inplaceReorder(map().reverseCellMap(), cellNLayers);
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 05d9025fd4..dac2dee240 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -1478,7 +1478,7 @@ void Foam::snappySnapDriver::detectNearSurfaces
                     // TBD: check if the attraction (to nearest) would attract
                     // good enough and not override attraction
 
-                    if (gapStr.valid())
+                    if (gapStr)
                     {
                         const point& intPt = hit2[pointi].hitPoint();
                         gapStr().write(linePointRef(pt, intPt));
@@ -1620,7 +1620,7 @@ void Foam::snappySnapDriver::detectNearSurfaces
                             )
                         )
                         {
-                            if (gapStr.valid())
+                            if (gapStr)
                             {
                                 const point& intPt = hit2[i].hitPoint();
                                 gapStr().write(linePointRef(pt, intPt));
@@ -2982,7 +2982,7 @@ void Foam::snappySnapDriver::doSnap
             false   // baffle zones
         );
 
-        if (mapPtr.valid())
+        if (mapPtr)
         {
             if (debug & meshRefinement::MESH)
             {
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index 752f6d5b95..cbe23e027f 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -1518,7 +1518,7 @@ void Foam::snappySnapDriver::releasePointsNextToMultiPatch
                 patchAttraction[pointi] = rawPatchAttraction[pointi];
                 patchConstraints[pointi] = rawPatchConstraints[pointi];
 
-                //if (multiPatchStr.valid())
+                //if (multiPatchStr)
                 //{
                 //    Pout<< "Adding constraint on multiPatchPoint:"
                 //        << pp.localPoints()[pointi]
@@ -1571,7 +1571,7 @@ void Foam::snappySnapDriver::releasePointsNextToMultiPatch
                     patchConstraints[pointi] = pointConstraint();
                     nChanged++;
 
-                    if (multiPatchStr.valid())
+                    if (multiPatchStr)
                     {
                         multiPatchStr().write(pp.localPoints()[pointi]);
                     }
@@ -2514,7 +2514,7 @@ void Foam::snappySnapDriver::determineFeatures
                         if (info.hit())
                         {
                             // Dump
-                            if (featureEdgeStr.valid())
+                            if (featureEdgeStr)
                             {
                                 featureEdgeStr().write
                                 (
@@ -2524,7 +2524,7 @@ void Foam::snappySnapDriver::determineFeatures
                         }
                         else
                         {
-                            if (missedEdgeStr.valid())
+                            if (missedEdgeStr)
                             {
                                 missedEdgeStr().write
                                 (
@@ -2708,7 +2708,7 @@ void Foam::snappySnapDriver::determineFeatures
                 }
                 else
                 {
-                    if (missedEdgeStr.valid())
+                    if (missedEdgeStr)
                     {
                         missedEdgeStr().write
                         (
@@ -2927,7 +2927,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
             pointStatus[e[0]] = 0;
             pointStatus[e[1]] = 0;
 
-            if (baffleEdgeStr.valid())
+            if (baffleEdgeStr)
             {
                 const point& p0 = pp.localPoints()[e[0]];
                 const point& p1 = pp.localPoints()[e[1]];
@@ -3823,7 +3823,7 @@ void Foam::snappySnapDriver::preventFaceSqueeze
 
                     patchAttraction[pointi] = nearestAttraction[pointi];
 
-                    if (strPtr.valid())
+                    if (strPtr)
                     {
                         strPtr().write
                         (
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index f01f8570da..535be31536 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -286,7 +286,7 @@ void Foam::AMIInterpolation::agglomerate
     }
 
     // Agglomerate weights and indices
-    if (targetMapPtr.valid())
+    if (targetMapPtr)
     {
         const mapDistribute& map = targetMapPtr();
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
index 55c518bda1..861ff876a4 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,7 +56,7 @@ class cyclicACMIPointPatchField
 :
     public coupledPointPatchField<Type>
 {
-    // Private data
+    // Private Data
 
         //- Local reference cast into the cyclicACMI patch
         const cyclicACMIPointPatch& cyclicACMIPatch_;
@@ -73,7 +74,7 @@ class cyclicACMIPointPatchField
         //- Owner side patch interpolation
         const PrimitivePatchInterpolation<primitivePatch>& ppi() const
         {
-            if (!ppiPtr_.valid())
+            if (!ppiPtr_)
             {
                 ppiPtr_.reset
                 (
@@ -90,7 +91,7 @@ class cyclicACMIPointPatchField
         //- Neighbour side patch interpolation
         const PrimitivePatchInterpolation<primitivePatch>& nbrPpi() const
         {
-            if (!nbrPpiPtr_.valid())
+            if (!nbrPpiPtr_)
             {
                 nbrPpiPtr_.reset
                 (
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
index 226b421a14..42830aba13 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,7 +56,7 @@ class cyclicAMIPointPatchField
 :
     public coupledPointPatchField<Type>
 {
-    // Private data
+    // Private Data
 
         //- Local reference cast into the cyclicAMI patch
         const cyclicAMIPointPatch& cyclicAMIPatch_;
@@ -73,7 +74,7 @@ class cyclicAMIPointPatchField
         //- Owner side patch interpolation
         const PrimitivePatchInterpolation<primitivePatch>& ppi() const
         {
-            if (!ppiPtr_.valid())
+            if (!ppiPtr_)
             {
                 ppiPtr_.reset
                 (
@@ -90,7 +91,7 @@ class cyclicAMIPointPatchField
         //- Neighbour side patch interpolation
         const PrimitivePatchInterpolation<primitivePatch>& nbrPpi() const
         {
-            if (!nbrPpiPtr_.valid())
+            if (!nbrPpiPtr_)
             {
                 nbrPpiPtr_.reset
                 (
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
index d8ade6e0cc..bc63d3ed1e 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
@@ -331,13 +331,13 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI() const
         label iter(0);
         label nTransformsOld(nTransforms_);
 
-        if (ownStr.valid())
+        if (ownStr)
         {
-            writeOBJ(thisPatch0, ownStr());
+            writeOBJ(thisPatch0, *ownStr);
         }
-        if (neiStr.valid())
+        if (neiStr)
         {
-            writeOBJ(nbrPatch0, neiStr());
+            writeOBJ(nbrPatch0, *neiStr);
         }
 
 
@@ -392,9 +392,9 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI() const
 
                 AMIPtr_->append(thisPatch, nbrPatch0);
 
-                if (ownStr.valid())
+                if (ownStr)
                 {
-                    writeOBJ(thisPatch, ownStr());
+                    writeOBJ(thisPatch, *ownStr);
                 }
             }
             else
@@ -411,9 +411,9 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI() const
 
                 AMIPtr_->append(thisPatch0, nbrPatch);
 
-                if (neiStr.valid())
+                if (neiStr)
                 {
-                    writeOBJ(nbrPatch, neiStr());
+                    writeOBJ(nbrPatch, *neiStr);
                 }
             }
 
@@ -445,15 +445,8 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI() const
 
 
         // Close debug streams
-        if (ownStr.valid())
-        {
-            ownStr.clear();
-        }
-        if (neiStr.valid())
-        {
-            neiStr.clear();
-        }
-
+        ownStr.reset(nullptr);
+        neiStr.reset(nullptr);
 
 
         // Average the number of transformations
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 81babc9c45..c2fe6eb8d9 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -517,7 +517,7 @@ void Foam::mappedPatchBase::findSamples
 void Foam::mappedPatchBase::calcMapping() const
 {
     static bool hasWarned = false;
-    if (mapPtr_.valid())
+    if (mapPtr_)
     {
         FatalErrorInFunction
             << "Mapping already calculated" << exit(FatalError);
diff --git a/src/meshTools/meshSearch/meshSearch.C b/src/meshTools/meshSearch/meshSearch.C
index 7a41644d87..ed0017ba9f 100644
--- a/src/meshTools/meshSearch/meshSearch.C
+++ b/src/meshTools/meshSearch/meshSearch.C
@@ -605,7 +605,7 @@ Foam::meshSearch::~meshSearch()
 
 const Foam::treeBoundBox& Foam::meshSearch::dataBoundBox() const
 {
-    if (!overallBbPtr_.valid())
+    if (!overallBbPtr_)
     {
         Random rndGen(261782);
         overallBbPtr_.reset
@@ -628,7 +628,7 @@ const Foam::treeBoundBox& Foam::meshSearch::dataBoundBox() const
 const Foam::indexedOctree<Foam::treeDataFace>&
 Foam::meshSearch::boundaryTree() const
 {
-    if (!boundaryTreePtr_.valid())
+    if (!boundaryTreePtr_)
     {
         // All boundary faces (not just walls)
         labelList bndFaces
@@ -662,7 +662,7 @@ Foam::meshSearch::boundaryTree() const
 const Foam::indexedOctree<Foam::treeDataFace>&
 Foam::meshSearch::nonCoupledBoundaryTree() const
 {
-    if (!nonCoupledBoundaryTreePtr_.valid())
+    if (!nonCoupledBoundaryTreePtr_)
     {
         // All non-coupled boundary faces (not just walls)
         const polyBoundaryMesh& patches = mesh_.boundaryMesh();
@@ -707,7 +707,7 @@ Foam::meshSearch::nonCoupledBoundaryTree() const
 const Foam::indexedOctree<Foam::treeDataCell>&
 Foam::meshSearch::cellTree() const
 {
-    if (!cellTreePtr_.valid())
+    if (!cellTreePtr_)
     {
         cellTreePtr_.reset
         (
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C
index a74ab1a59d..8cab3a7008 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C
@@ -697,7 +697,7 @@ bool Foam::searchableSurfaces::checkIntersection
                             << " locations."
                             << endl;
 
-                        if (setWriter.valid())
+                        if (setWriter)
                         {
                             scalarField dist(mag(intersections));
                             coordSet track
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C
index 5564671e54..46eee718a7 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C
@@ -204,7 +204,7 @@ const volVectorField& objectiveIncompressible::dJdv()
             )
         );
     }
-    return dJdvPtr_();
+    return *dJdvPtr_;
 }
 
 
@@ -223,7 +223,7 @@ const volScalarField& objectiveIncompressible::dJdp()
             )
         );
     }
-    return dJdpPtr_();
+    return *dJdpPtr_;
 }
 
 
@@ -242,7 +242,7 @@ const volScalarField& objectiveIncompressible::dJdT()
             )
         );
     }
-    return dJdTPtr_();
+    return *dJdTPtr_;
 }
 
 
@@ -261,7 +261,7 @@ const volScalarField& objectiveIncompressible::dJdTMvar1()
             )
         );
     }
-    return dJdTMvar1Ptr_();
+    return *dJdTMvar1Ptr_;
 }
 
 
@@ -280,7 +280,7 @@ const volScalarField& objectiveIncompressible::dJdTMvar2()
             )
         );
     }
-    return dJdTMvar2Ptr_();
+    return *dJdTMvar2Ptr_;
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressibleI.H b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressibleI.H
index 7f9b54a5ea..4b1bb5f442 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressibleI.H
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressibleI.H
@@ -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.
@@ -32,73 +32,73 @@ License
 
 inline bool Foam::objectiveIncompressible::hasdJdv() const
 {
-    return dJdvPtr_.valid();
+    return bool(dJdvPtr_);
 }
 
 
 inline bool Foam::objectiveIncompressible::hasdJdp() const
 {
-    return dJdpPtr_.valid();
+    return bool(dJdpPtr_);
 }
 
 
 inline bool Foam::objectiveIncompressible::hasdJdT() const
 {
-    return dJdTPtr_.valid();
+    return bool(dJdTPtr_);
 }
 
 
 inline bool Foam::objectiveIncompressible::hasdJdTMVar1() const
 {
-    return dJdTMvar1Ptr_.valid();
+    return bool(dJdTMvar1Ptr_);
 }
 
 
 inline bool Foam::objectiveIncompressible::hasdJdTMVar2() const
 {
-    return dJdTMvar2Ptr_.valid();
+    return bool(dJdTMvar2Ptr_);
 }
 
 
 inline bool Foam::objectiveIncompressible::hasBoundarydJdv() const
 {
-    return bdJdvPtr_.valid();
+    return bool(bdJdvPtr_);
 }
 
 
 inline bool Foam::objectiveIncompressible::hasBoundarydJdvn() const
 {
-    return bdJdvnPtr_.valid();
+    return bool(bdJdvnPtr_);
 }
 
 
 inline bool Foam::objectiveIncompressible::hasBoundarydJdvt() const
 {
-    return bdJdvtPtr_.valid();
+    return bool(bdJdvtPtr_);
 }
 
 
 inline bool Foam::objectiveIncompressible::hasBoundarydJdp() const
 {
-    return bdJdpPtr_.valid();
+    return bool(bdJdpPtr_);
 }
 
 
 inline bool Foam::objectiveIncompressible::hasBoundarydJdT() const
 {
-    return bdJdTPtr_.valid();
+    return bool(bdJdTPtr_);
 }
 
 
 inline bool Foam::objectiveIncompressible::hasBoundarydJdTMVar1() const
 {
-    return bdJdTMvar1Ptr_.valid();
+    return bool(bdJdTMvar1Ptr_);
 }
 
 
 inline bool Foam::objectiveIncompressible::hasBoundarydJdTMVar2() const
 {
-    return bdJdTMvar2Ptr_.valid();
+    return bool(bdJdTMvar2Ptr_);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
index b4e3e2d8a3..2e3e886d8c 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
@@ -428,7 +428,7 @@ const volScalarField& objective::dJdb()
         );
     }
 
-    return dJdbPtr_();
+    return *dJdbPtr_;
 }
 
 
@@ -514,7 +514,7 @@ const boundaryVectorField& objective::boundarydJdb()
     {
         bdJdbPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
     }
-    return bdJdbPtr_();
+    return *bdJdbPtr_;
 }
 
 
@@ -524,7 +524,7 @@ const boundaryVectorField& objective::dSdbMultiplier()
     {
         bdSdbMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
     }
-    return bdSdbMultPtr_();
+    return *bdSdbMultPtr_;
 }
 
 
@@ -534,7 +534,7 @@ const boundaryVectorField& objective::dndbMultiplier()
     {
         bdndbMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
     }
-    return bdndbMultPtr_();
+    return *bdndbMultPtr_;
 }
 
 
@@ -544,7 +544,7 @@ const boundaryVectorField& objective::dxdbMultiplier()
     {
         bdxdbMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
     }
-    return bdxdbMultPtr_();
+    return *bdxdbMultPtr_;
 }
 
 
@@ -554,7 +554,7 @@ const boundaryVectorField& objective::dxdbDirectMultiplier()
     {
         bdxdbDirectMultPtr_.reset(createZeroBoundaryPtr<vector>(mesh_));
     }
-    return bdxdbDirectMultPtr_();
+    return *bdxdbDirectMultPtr_;
 }
 
 
@@ -567,7 +567,7 @@ const vectorField3& objective::boundaryEdgeMultiplier()
             << endl << endl
             << exit(FatalError);
     }
-    return bEdgeContribution_();
+    return *bEdgeContribution_;
 }
 
 
@@ -577,7 +577,7 @@ const boundaryTensorField& objective::boundarydJdStress()
     {
         bdJdStressPtr_.reset(createZeroBoundaryPtr<tensor>(mesh_));
     }
-    return bdJdStressPtr_();
+    return *bdJdStressPtr_;
 }
 
 
@@ -598,7 +598,7 @@ const volScalarField& objective::divDxDbMultiplier()
             )
         );
     }
-    return divDxDbMultPtr_();
+    return *divDxDbMultPtr_;
 }
 
 
@@ -618,7 +618,7 @@ const volTensorField& objective::gradDxDbMultiplier()
             )
         );
     }
-    return gradDxDbMultPtr_();
+    return *gradDxDbMultPtr_;
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objectiveI.H b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objectiveI.H
index 315308251a..9609184627 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objectiveI.H
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objectiveI.H
@@ -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.
@@ -38,73 +38,73 @@ inline const Foam::word& Foam::objective::objectiveName() const
 
 inline bool Foam::objective::hasdJdb() const
 {
-    return dJdbPtr_.valid();
+    return bool(dJdbPtr_);
 }
 
 
 inline bool Foam::objective::hasBoundarydJdb() const
 {
-    return bdJdbPtr_.valid();
+    return bool(bdJdbPtr_);
 }
 
 
 inline bool Foam::objective::hasdSdbMult() const
 {
-    return bdSdbMultPtr_.valid();
+    return bool(bdSdbMultPtr_);
 }
 
 
 inline bool Foam::objective::hasdndbMult() const
 {
-    return bdndbMultPtr_.valid();
+    return bool(bdndbMultPtr_);
 }
 
 
 inline bool Foam::objective::hasdxdbMult() const
 {
-    return bdxdbMultPtr_.valid();
+    return bool(bdxdbMultPtr_);
 }
 
 
 inline bool Foam::objective::hasdxdbDirectMult() const
 {
-    return bdxdbDirectMultPtr_.valid();
+    return bool(bdxdbDirectMultPtr_);
 }
 
 
 inline bool Foam::objective::hasBoundaryEdgeContribution() const
 {
-    return bEdgeContribution_.valid();
+    return bool(bEdgeContribution_);
 }
 
 
 inline bool Foam::objective::hasDivDxDbMult() const
 {
-    return divDxDbMultPtr_.valid();
+    return bool(divDxDbMultPtr_);
 }
 
 
 inline bool Foam::objective::hasGradDxDbMult() const
 {
-    return gradDxDbMultPtr_.valid();
+    return bool(gradDxDbMultPtr_);
 }
 
 
 inline bool Foam::objective::hasBoundarydJdStress() const
 {
-    return bdJdStressPtr_.valid();
+    return bool(bdJdStressPtr_);
 }
 
 
 inline bool Foam::objective::hasIntegrationStartTime() const
 {
-    return integrationStartTimePtr_.valid();
+    return bool(integrationStartTimePtr_);
 }
 
 
 inline bool Foam::objective::hasIntegrationEndTime() const
 {
-    return integrationEndTimePtr_.valid();
+    return bool(integrationEndTimePtr_);
 }
 
 // ************************************************************************* //
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 beb01e35e0..334f1c2685 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.C
@@ -122,7 +122,7 @@ bool FIBase::readDict(const dictionary& dict)
 {
     if (sensitivity::readDict(dict))
     {
-        if (eikonalSolver_.valid())
+        if (eikonalSolver_)
         {
             eikonalSolver_().readDict(dict);
         }
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C
index a18a831131..81c49c9231 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C
@@ -122,7 +122,7 @@ void adjointMeshMovementSolver::solve()
     read();
 
     // Add source from the adjoint eikonal equation
-    if (adjointEikonalSolverPtr_.valid())
+    if (adjointEikonalSolverPtr_)
     {
         source_ -=
             fvc::div(adjointEikonalSolverPtr_().getFISensitivityTerm()().T());
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.C
index 5ed9ec2fa1..d88acf0693 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.C
@@ -130,7 +130,7 @@ const scalarField& adjointSensitivity::getSensitivities() const
 void adjointSensitivity::clearSensitivities()
 {
     derivatives_ = scalar(0);
-    if (fieldSensPtr_.valid())
+    if (fieldSensPtr_)
     {
         fieldSensPtr_().primitiveFieldRef() = scalar(0);
     }
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 e35e990054..0f11145894 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
@@ -382,12 +382,12 @@ bool sensitivitySurface::readDict(const dictionary& dict)
 {
     if (sensitivity::readDict(dict))
     {
-        if (eikonalSolver_.valid())
+        if (eikonalSolver_)
         {
             eikonalSolver_().readDict(dict);
         }
 
-        if (meshMovementSolver_.valid())
+        if (meshMovementSolver_)
         {
             meshMovementSolver_().readDict(dict);
         }
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 fbe520c895..ce9654cf16 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C
@@ -394,12 +394,12 @@ bool sensitivitySurfacePoints::readDict(const dictionary& dict)
 {
     if (sensitivity::readDict(dict))
     {
-        if (eikonalSolver_.valid())
+        if (eikonalSolver_)
         {
             eikonalSolver_().readDict(dict);
         }
 
-        if (meshMovementSolver_.valid())
+        if (meshMovementSolver_)
         {
             meshMovementSolver_().readDict(dict);
         }
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/sensitivity/sensitivity.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/sensitivity/sensitivity.C
index b69688cdb0..6694ed50d7 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/sensitivity/sensitivity.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/sensitivity/sensitivity.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.
@@ -76,9 +76,9 @@ void Foam::sensitivity::computeDerivativesSize()
 
 void Foam::sensitivity::write(const word& baseName)
 {
-    if (fieldSensPtr_.valid())
+    if (fieldSensPtr_)
     {
-        fieldSensPtr_().write();
+        fieldSensPtr_->write();
     }
 }
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.C
index 4170963659..84de7ea3d4 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.C
@@ -43,7 +43,7 @@ namespace Foam
 void Foam::shapeSensitivitiesBase::writeFaceBasedSens() const
 {
     // Wall face sensitivity projected to normal
-    if (wallFaceSensNormalPtr_.valid())
+    if (wallFaceSensNormalPtr_)
     {
         constructAndWriteSensitivityField<scalar>
         (
@@ -55,7 +55,7 @@ void Foam::shapeSensitivitiesBase::writeFaceBasedSens() const
     if (writeAllSurfaceFiles_)
     {
         // Wall face sensitivity vectors
-        if (wallFaceSensVecPtr_.valid())
+        if (wallFaceSensVecPtr_)
         {
             constructAndWriteSensitivityField<vector>
             (
@@ -65,7 +65,7 @@ void Foam::shapeSensitivitiesBase::writeFaceBasedSens() const
         }
 
         // Normal sens as vectors
-        if (wallFaceSensNormalVecPtr_.valid())
+        if (wallFaceSensNormalVecPtr_)
         {
             constructAndWriteSensitivityField<vector>
             (
@@ -80,7 +80,7 @@ void Foam::shapeSensitivitiesBase::writeFaceBasedSens() const
 void Foam::shapeSensitivitiesBase::writePointBasedSens() const
 {
     // Wall point sensitivity projected to normal
-    if (wallPointSensNormalPtr_.valid())
+    if (wallPointSensNormalPtr_)
     {
         constructAndWriteSensitivtyPointField<scalar>
         (
@@ -95,7 +95,7 @@ void Foam::shapeSensitivitiesBase::writePointBasedSens() const
     if (writeAllSurfaceFiles_)
     {
         // Wall point sensitivity vectors
-        if (wallPointSensVecPtr_.valid())
+        if (wallPointSensVecPtr_)
         {
             constructAndWriteSensitivtyPointField<vector>
             (
@@ -105,7 +105,7 @@ void Foam::shapeSensitivitiesBase::writePointBasedSens() const
         }
 
         // Normal point as vectors
-        if (wallPointSensNormalVecPtr_.valid())
+        if (wallPointSensNormalVecPtr_)
         {
             constructAndWriteSensitivtyPointField<vector>
             (
@@ -175,35 +175,35 @@ void Foam::shapeSensitivitiesBase::setSensitivityPatchIDs
 void Foam::shapeSensitivitiesBase::clearSensitivities()
 {
     // Face-based boundary sens
-    if (wallFaceSensVecPtr_.valid())
+    if (wallFaceSensVecPtr_)
     {
         wallFaceSensVecPtr_() = vector::zero;
     }
-    if (wallFaceSensNormalVecPtr_.valid())
+    if (wallFaceSensNormalVecPtr_)
     {
         wallFaceSensNormalVecPtr_() = vector::zero;
     }
-    if (wallFaceSensNormalPtr_.valid())
+    if (wallFaceSensNormalPtr_)
     {
         wallFaceSensNormalPtr_() = scalar(0);
     }
 
     // Point-based boundary sens
-    if (wallPointSensVecPtr_.valid())
+    if (wallPointSensVecPtr_)
     {
         for (vectorField& patchSens : wallPointSensVecPtr_())
         {
             patchSens = vector::zero;
         }
     }
-    if (wallPointSensNormalVecPtr_.valid())
+    if (wallPointSensNormalVecPtr_)
     {
         for (vectorField& patchSens : wallPointSensNormalVecPtr_())
         {
             patchSens = vector::zero;
         }
     }
-    if (wallPointSensNormalPtr_.valid())
+    if (wallPointSensNormalPtr_)
     {
         for (scalarField& patchSens : wallPointSensNormalPtr_())
         {
@@ -229,7 +229,7 @@ void Foam::shapeSensitivitiesBase::setSuffix(const word& suffix)
 Foam::tmp<Foam::volVectorField>
 Foam::shapeSensitivitiesBase::getWallFaceSensVec()
 {
-    if (wallFaceSensVecPtr_.valid())
+    if (wallFaceSensVecPtr_)
     {
         return
             constructVolSensitivtyField<vector>
@@ -260,7 +260,7 @@ Foam::shapeSensitivitiesBase::getWallFaceSensVec()
 Foam::tmp<Foam::volScalarField>
 Foam::shapeSensitivitiesBase::getWallFaceSensNormal()
 {
-    if (wallFaceSensNormalPtr_.valid())
+    if (wallFaceSensNormalPtr_)
     {
         return
             constructVolSensitivtyField<scalar>
@@ -290,7 +290,7 @@ Foam::shapeSensitivitiesBase::getWallFaceSensNormal()
 Foam::tmp<Foam::volVectorField>
 Foam::shapeSensitivitiesBase::getWallFaceSensNormalVec()
 {
-    if (wallFaceSensNormalVecPtr_.valid())
+    if (wallFaceSensNormalVecPtr_)
     {
         return
             constructVolSensitivtyField<vector>
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/steadyOptimisation/steadyOptimisation.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/steadyOptimisation/steadyOptimisation.C
index 470756d7f1..50a2507689 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/steadyOptimisation/steadyOptimisation.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/steadyOptimisation/steadyOptimisation.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.
@@ -225,7 +225,7 @@ void Foam::steadyOptimisation::updateDesignVariables()
 {
     // Update design variables using either a line-search scheme or
     // a fixed-step update
-    if (optType_->getLineSearch().valid())
+    if (optType_->getLineSearch())
     {
         lineSearchUpdate();
     }
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.C
index 06b2de5394..3a1097825a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.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.
@@ -180,7 +180,7 @@ void optimisationType::update(scalarField& direction)
 
     // Multiply with line search step, if necessary
     scalarField correction(direction);
-    if (lineSearch_.valid())
+    if (lineSearch_)
     {
         correction *= lineSearch_->step();
     }
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C
index 6af773aca9..3ce2914ab2 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C
@@ -91,7 +91,7 @@ void shapeOptimisation::computeEta
     {
         // In the unlikely event that eta is not set and the line search step
         // is not 1, multiply with it
-        // if (lineSearch_.valid()) correction *= lineSearch_->step();
+        // if (lineSearch_) correction *= lineSearch_->step();
 
         // Compute eta based on desirable mesh movement size
         scalar eta = optMeshMovement_->computeEta(correction);
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 46ed2da21d..04da7cb95a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
@@ -121,7 +121,7 @@ void Foam::NURBS3DVolume::computeParametricCoordinates
 {
     scalar timeBef = mesh_.time().elapsedCpuTime();
 
-    if (parametricCoordinatesPtr_.valid())
+    if (parametricCoordinatesPtr_)
     {
         FatalErrorInFunction
            << "Attempting to recompute parametric coordinates"
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 3abbac727c..9412083eb0 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointRASModel/adjointRASModel.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointRASModel/adjointRASModel.C
@@ -66,7 +66,7 @@ void adjointRASModel::setMeanFields()
     const solverControl& solControl = adjointVars_.getSolverControl();
     if (solControl.average())
     {
-        if (adjointTMVariable1Ptr_.valid())
+        if (adjointTMVariable1Ptr_)
         {
             adjointTMVariable1MeanPtr_.reset
             (
@@ -85,7 +85,7 @@ void adjointRASModel::setMeanFields()
             );
         }
 
-        if (adjointTMVariable2Ptr_.valid())
+        if (adjointTMVariable2Ptr_)
         {
             adjointTMVariable2MeanPtr_.reset
             (
@@ -420,12 +420,12 @@ void adjointRASModel::resetMeanFields()
     const solverControl& solControl = adjointVars_.getSolverControl();
     if (solControl.average())
     {
-        if (adjointTMVariable1MeanPtr_.valid())
+        if (adjointTMVariable1MeanPtr_)
         {
             adjointTMVariable1MeanPtr_() ==
                 dimensionedScalar(adjointTMVariable1Ptr_().dimensions(), Zero);
         }
-        if (adjointTMVariable2MeanPtr_.valid())
+        if (adjointTMVariable2MeanPtr_)
         {
             adjointTMVariable2MeanPtr_() ==
                 dimensionedScalar(adjointTMVariable2Ptr_().dimensions(), Zero);
@@ -443,13 +443,13 @@ void adjointRASModel::computeMeanFields()
         scalar avIter(iAverageIter);
         scalar oneOverItP1 = 1./(avIter+1);
         scalar mult = avIter*oneOverItP1;
-        if (adjointTMVariable1MeanPtr_.valid())
+        if (adjointTMVariable1MeanPtr_)
         {
             adjointTMVariable1MeanPtr_() ==
                 adjointTMVariable1Ptr_()*mult
               + getAdjointTMVariable1Inst()*oneOverItP1;
         }
-        if (adjointTMVariable2MeanPtr_.valid())
+        if (adjointTMVariable2MeanPtr_)
         {
             adjointTMVariable2MeanPtr_() ==
                 adjointTMVariable2Ptr_()*mult
diff --git a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
index a225638832..51775fdd4a 100644
--- a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
+++ b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
@@ -534,7 +534,7 @@ void Foam::cellCellStencils::cellVolumeWeight::interpolatePatchTypes
     // Initialise to not-mapped
     result = -1;
 
-    if (mapPtr.valid())
+    if (mapPtr)
     {
         // Pull remote data into order of addressing
         labelList work(patchTypes);
@@ -861,9 +861,9 @@ bool Foam::cellCellStencils::cellVolumeWeight::update()
                         label cellI = tgtCellMap[tgtCellI];
                         tgtGlobalCells[tgtCellI] = globalCells.toGlobal(cellI);
                     }
-                    if (mapper.tgtMap().valid())
+                    if (mapper.tgtMap())
                     {
-                        mapper.tgtMap()().distribute(tgtGlobalCells);
+                        mapper.tgtMap()->distribute(tgtGlobalCells);
                     }
                 }
                 combineCellTypes
@@ -904,9 +904,9 @@ bool Foam::cellCellStencils::cellVolumeWeight::update()
                         label cellI = srcCellMap[srcCellI];
                         srcGlobalCells[srcCellI] = globalCells.toGlobal(cellI);
                     }
-                    if (mapper.srcMap().valid())
+                    if (mapper.srcMap())
                     {
-                        mapper.srcMap()().distribute(srcGlobalCells);
+                        mapper.srcMap()->distribute(srcGlobalCells);
                     }
                 }
 
diff --git a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H
index e4deafe1b5..c549928020 100644
--- a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H
+++ b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H
@@ -207,7 +207,7 @@ public:
         //- Return a communication schedule
         virtual const mapDistribute& cellInterpolationMap() const
         {
-            if (!cellInterpolationMap_.valid())
+            if (!cellInterpolationMap_)
             {
                 const_cast<cellVolumeWeight&>(*this).update();
             }
diff --git a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H
index 92f0c85f7a..2a73249016 100644
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2018 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -304,7 +304,7 @@ public:
         //- Return a communication schedule
         virtual const mapDistribute& cellInterpolationMap() const
         {
-            if (!cellInterpolationMap_.valid())
+            if (!cellInterpolationMap_)
             {
                 const_cast<inverseDistance&>(*this).update();
             }
diff --git a/src/parallel/decompose/decompose/decompositionModel.H b/src/parallel/decompose/decompose/decompositionModel.H
index b7ebe37f6a..99e5f6bae0 100644
--- a/src/parallel/decompose/decompose/decompositionModel.H
+++ b/src/parallel/decompose/decompose/decompositionModel.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -122,7 +122,7 @@ public:
 
         decompositionMethod& decomposer() const
         {
-            if (!decomposerPtr_.valid())
+            if (!decomposerPtr_)
             {
                 decomposerPtr_ =
                     decompositionMethod::New
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 7c042cc6ad..3740e36615 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -1601,7 +1601,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
         "distributedTriSurfaceMesh::independentlyDistributedBbs"
     );
 
-    if (!decomposer_.valid())
+    if (!decomposer_)
     {
         // Use singleton decomposeParDict. Cannot use decompositionModel
         // here since we've only got Time and not a mesh.
@@ -1619,7 +1619,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
         }
         else
         {
-            if (!decomposeParDict_.valid())
+            if (!decomposeParDict_)
             {
                 decomposeParDict_.reset
                 (
@@ -1637,7 +1637,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
                     )
                 );
             }
-            decomposer_ = decompositionMethod::New(decomposeParDict_());
+            decomposer_ = decompositionMethod::New(*decomposeParDict_);
         }
     }
 
@@ -2756,7 +2756,7 @@ void Foam::distributedTriSurfaceMesh::clearOut()
 
 const Foam::globalIndex& Foam::distributedTriSurfaceMesh::globalTris() const
 {
-    if (!globalTris_.valid())
+    if (!globalTris_)
     {
         globalTris_.reset(new globalIndex(triSurface::size()));
     }
diff --git a/src/parallel/distributed/patchDistMethods/exact/exactPatchDistMethod.C b/src/parallel/distributed/patchDistMethods/exact/exactPatchDistMethod.C
index 7f93d67240..fc68b46c08 100644
--- a/src/parallel/distributed/patchDistMethods/exact/exactPatchDistMethod.C
+++ b/src/parallel/distributed/patchDistMethods/exact/exactPatchDistMethod.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.
@@ -46,7 +46,7 @@ namespace patchDistMethods
 const Foam::distributedTriSurfaceMesh&
 Foam::patchDistMethods::exact::patchSurface() const
 {
-    if (!patchSurfPtr_.valid())
+    if (!patchSurfPtr_)
     {
         const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
 
diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
index 8aa6ad3e5d..92175160ba 100644
--- a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -143,7 +143,7 @@ Foam::BlendedInterfacialModel<ModelType>::evaluate
         )
     );
 
-    if (model_.valid())
+    if (model_)
     {
         if (subtract)
         {
@@ -156,12 +156,12 @@ Foam::BlendedInterfacialModel<ModelType>::evaluate
         x.ref() += (model_().*method)(args ...)*(scalar(1) - f1() - f2());
     }
 
-    if (model1In2_.valid())
+    if (model1In2_)
     {
         x.ref() += (model1In2_().*method)(args ...)*f1;
     }
 
-    if (model2In1_.valid())
+    if (model2In1_)
     {
         tmp<typeGeoField> dx = (model2In1_().*method)(args ...)*f2;
 
diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
index 33deb560a7..30a7010cf5 100644
--- a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
+++ b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
@@ -155,7 +155,7 @@ InterfaceCompositionPhaseChangePhaseSystem
 
         const phasePair& uoPair = this->phasePairs_[key];
 
-        if (!massTransferModels_[uoPair][uoPair.index(phase)].valid())
+        if (!massTransferModels_[uoPair][uoPair.index(phase)])
         {
             FatalErrorInFunction
                 << "A mass transfer model for the " << pair.phase1().name()
diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C
index afaf5d73c9..d2e61843e3 100644
--- a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C
+++ b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C
@@ -65,14 +65,14 @@ TwoResistanceHeatTransferPhaseSystem
     {
         const phasePair& pair = this->phasePairs_[heatTransferModelIter.key()];
 
-        if (!heatTransferModels_[pair].first().valid())
+        if (!heatTransferModels_[pair].first())
         {
             FatalErrorInFunction
                 << "A heat transfer model for the " << pair.phase1().name()
                 << " side of the " << pair << " pair is not specified"
                 << exit(FatalError);
         }
-        if (!heatTransferModels_[pair].second().valid())
+        if (!heatTransferModels_[pair].second())
         {
             FatalErrorInFunction
                 << "A heat transfer model for the " << pair.phase2().name()
diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
index 93981e3f67..2e896f9f62 100644
--- a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
+++ b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
@@ -111,7 +111,9 @@ void Foam::phaseSystem::generatePairsAndSubModels
 
     forAllConstIter(typename modelTypeTable, tempModels, iter)
     {
-        if (!iter().valid())
+        const autoPtr<modelType>& modelPtr = iter.val();
+
+        if (!modelPtr)
         {
             continue;
         }
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index d92a452172..70087f338f 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -121,7 +121,7 @@ void Foam::regionModels::regionModel::initialise()
             << "between regions will not be possible" << endl;
     }
 
-    if (!outputPropertiesPtr_.valid())
+    if (!outputPropertiesPtr_)
     {
         const fileName uniformPath(word("uniform")/"regionModels");
 
diff --git a/src/regionModels/regionModel/regionModel/regionModelI.H b/src/regionModels/regionModel/regionModel/regionModelI.H
index abd9a94283..fc101bdbe5 100644
--- a/src/regionModels/regionModel/regionModel/regionModelI.H
+++ b/src/regionModels/regionModel/regionModel/regionModelI.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -104,7 +105,7 @@ Foam::regionModels::regionModel::solution() const
 inline const Foam::IOdictionary&
 Foam::regionModels::regionModel::outputProperties() const
 {
-    if (!outputPropertiesPtr_.valid())
+    if (!outputPropertiesPtr_)
     {
         FatalErrorInFunction
             << "outputProperties dictionary not available"
@@ -118,7 +119,7 @@ Foam::regionModels::regionModel::outputProperties() const
 inline Foam::IOdictionary&
 Foam::regionModels::regionModel::outputProperties()
 {
-    if (!outputPropertiesPtr_.valid())
+    if (!outputPropertiesPtr_)
     {
         FatalErrorInFunction
             << "outputProperties dictionary not available"
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1DI.H b/src/regionModels/regionModel/regionModel1D/regionModel1DI.H
index 5fdc2da4ca..97276ca203 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1DI.H
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1DI.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.
@@ -53,7 +54,7 @@ Foam::regionModels::regionModel1D::boundaryFaceOppositeFace() const
 inline const Foam::surfaceScalarField&
 Foam::regionModels::regionModel1D::nMagSf() const
 {
-    if (!nMagSfPtr_.valid())
+    if (!nMagSfPtr_)
     {
         FatalErrorInFunction
          << "Face normal areas not available" << abort(FatalError);
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
index 92931324a8..e4afd0ddfd 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -208,7 +209,7 @@ Foam::regionModels::singleLayerRegion::~singleLayerRegion()
 
 const Foam::volVectorField& Foam::regionModels::singleLayerRegion::nHat() const
 {
-    if (!nHatPtr_.valid())
+    if (!nHatPtr_)
     {
         FatalErrorInFunction
             << "Region patch normal vectors not available"
@@ -221,7 +222,7 @@ const Foam::volVectorField& Foam::regionModels::singleLayerRegion::nHat() const
 
 const Foam::volScalarField& Foam::regionModels::singleLayerRegion::magSf() const
 {
-    if (!magSfPtr_.valid())
+    if (!magSfPtr_)
     {
         FatalErrorInFunction
             << "Region patch areas not available"
diff --git a/src/sampling/sampledSet/patchSeed/patchSeedSet.C b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
index 65a2fdfa36..f2f1b965ad 100644
--- a/src/sampling/sampledSet/patchSeed/patchSeedSet.C
+++ b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
@@ -81,11 +81,11 @@ void Foam::patchSeedSet::calcSamples
     }
 
 
-    if (!rndGenPtr_.valid())
+    if (!rndGenPtr_)
     {
         rndGenPtr_.reset(new Random(0));
     }
-    Random& rndGen = rndGenPtr_();
+    Random& rndGen = *rndGenPtr_;
 
 
     if (selectedLocations_.size())
diff --git a/src/sampling/sampledSet/shortestPath/shortestPathSet.C b/src/sampling/sampledSet/shortestPath/shortestPathSet.C
index 8b4ba57e65..cd5f1c85f7 100644
--- a/src/sampling/sampledSet/shortestPath/shortestPathSet.C
+++ b/src/sampling/sampledSet/shortestPath/shortestPathSet.C
@@ -1023,10 +1023,7 @@ void Foam::shortestPathSet::genSamples
             // Normal operation: walking has closed some wall-connected faces
             // If previous iteration was markLeakPath-mode make sure to revert
             // to normal operation (i.e. face marked in isLeakFace)
-            if (isBlockedFace.valid())
-            {
-                isBlockedFace.clear();
-            }
+            isBlockedFace.reset(nullptr);
             markLeakPath = false;
         }
         else
@@ -1048,7 +1045,7 @@ void Foam::shortestPathSet::genSamples
 
 
             // Revert to boundaryFaces only
-            if (!isBlockedFace.valid())
+            if (!isBlockedFace)
             {
                 //Pout<< "** Starting from original boundary faces." << endl;
                 isBlockedFace.reset(new bitSet(isBoundaryFace));
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index 314153913d..76b8d181c4 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -352,7 +352,7 @@ bool Foam::sampledIsoSurface::updateGeometry() const
     // Clear derived data
     clearGeom();
 
-    if (subMeshPtr_.valid())
+    if (subMeshPtr_)
     {
         const volScalarField& vfld = *volSubFieldPtr_;
 
@@ -396,9 +396,9 @@ bool Foam::sampledIsoSurface::updateGeometry() const
             << "    average        : " << Switch(average_) << nl
             << "    isoField       : " << isoField_ << nl
             << "    isoValue       : " << isoVal_ << nl;
-        if (subMeshPtr_.valid())
+        if (subMeshPtr_)
         {
-            Pout<< "    zone size      : " << subMeshPtr_().subMesh().nCells()
+            Pout<< "    zone size      : " << subMeshPtr_->subMesh().nCells()
                 << nl;
         }
         Pout<< "    points         : " << points().size() << nl
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
index 16e39feaec..022c1cdd77 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -64,9 +64,9 @@ Foam::sampledIsoSurface::sampleOnPoints
     // Assume volPointInterpolation for the point field!
     const auto& volFld = interpolator.psi();
 
-    if (subMeshPtr_.valid())
+    if (subMeshPtr_)
     {
-        auto tvolSubFld = subMeshPtr_().interpolate(volFld);
+        auto tvolSubFld = subMeshPtr_->interpolate(volFld);
         const auto& volSubFld = tvolSubFld();
 
         auto tpointFld =
diff --git a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
index f842795141..cb7080d30a 100644
--- a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
+++ b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
@@ -366,7 +366,7 @@ const Foam::meshedSurface& Foam::ensightSurfaceReader::geometry
 {
     DebugInFunction << endl;
 
-    if (!surfPtr_.valid())
+    if (!surfPtr_)
     {
         fileName meshInstance(replaceMask(meshFileName_, timeIndex));
         IFstream isBinary(baseDir_/meshInstance, IOstream::BINARY);
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
index f8bcfbed1b..6da6524313 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,9 +60,9 @@ Foam::sampledCuttingPlane::sampleOnPoints
     // Assume volPointInterpolation for the point field!
     const auto& volFld = interpolator.psi();
 
-    if (subMeshPtr_.valid())
+    if (subMeshPtr_)
     {
-        auto tvolSubFld = subMeshPtr_().interpolate(volFld);
+        auto tvolSubFld = subMeshPtr_->interpolate(volFld);
         const auto& volSubFld = tvolSubFld();
 
         auto tpointFld =
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
index 93e5e6f43c..12ec4e647a 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.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.
diff --git a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
index 9a19491c42..2367700035 100644
--- a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
+++ b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -122,7 +123,7 @@ const Foam::basicSpecieMixture& Foam::SLGThermo::carrier() const
 
 const Foam::liquidMixtureProperties& Foam::SLGThermo::liquids() const
 {
-    if (!liquids_.valid())
+    if (!liquids_)
     {
         FatalErrorInFunction
             << "liquids requested, but object is not allocated"
@@ -135,7 +136,7 @@ const Foam::liquidMixtureProperties& Foam::SLGThermo::liquids() const
 
 const Foam::solidMixtureProperties& Foam::SLGThermo::solids() const
 {
-    if (!solids_.valid())
+    if (!solids_)
     {
         FatalErrorInFunction
             << "solids requested, but object is not allocated"
@@ -230,13 +231,13 @@ bool Foam::SLGThermo::hasMultiComponentCarrier() const
 
 bool Foam::SLGThermo::hasLiquids() const
 {
-    return liquids_.valid();
+    return bool(liquids_);
 }
 
 
 bool Foam::SLGThermo::hasSolids() const
 {
-    return solids_.valid();
+    return bool(solids_);
 }
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index 12bd0c2f69..6d0d667759 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd
+    Copyright (C) 2018-2020 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -225,7 +225,7 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
         else
         {
             // Demand driven load the IDefault field
-            if (!IDefaultPtr.valid())
+            if (!IDefaultPtr)
             {
                 IDefaultPtr.reset
                 (
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
index f6ffb6c39a..1bd4f4a995 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
@@ -306,7 +306,7 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::radiation::radiationModel::ST
 const Foam::radiation::absorptionEmissionModel&
 Foam::radiation::radiationModel::absorptionEmission() const
 {
-    if (!absorptionEmission_.valid())
+    if (!absorptionEmission_)
     {
         FatalErrorInFunction
             << "Requested radiation absorptionEmission model, but model is "
@@ -320,7 +320,7 @@ Foam::radiation::radiationModel::absorptionEmission() const
 const Foam::radiation::sootModel&
 Foam::radiation::radiationModel::soot() const
 {
-    if (!soot_.valid())
+    if (!soot_)
     {
         FatalErrorInFunction
             << "Requested radiation sootModel model, but model is "
@@ -334,7 +334,7 @@ Foam::radiation::radiationModel::soot() const
 const Foam::radiation::transmissivityModel&
 Foam::radiation::radiationModel::transmissivity() const
 {
-    if (!transmissivity_.valid())
+    if (!transmissivity_)
     {
         FatalErrorInFunction
             << "Requested radiation sootModel model, but model is "
diff --git a/src/topoChangerFvMesh/dynamicMotionSolverTopoFvMesh/dynamicMotionSolverTopoFvMesh.C b/src/topoChangerFvMesh/dynamicMotionSolverTopoFvMesh/dynamicMotionSolverTopoFvMesh.C
index 85ca376059..1dab5568ca 100644
--- a/src/topoChangerFvMesh/dynamicMotionSolverTopoFvMesh/dynamicMotionSolverTopoFvMesh.C
+++ b/src/topoChangerFvMesh/dynamicMotionSolverTopoFvMesh/dynamicMotionSolverTopoFvMesh.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenCFD Ltd
+    Copyright (C) 2016-2020 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -73,7 +73,7 @@ bool Foam::dynamicMotionSolverTopoFvMesh::update()
     // Do mesh changes (not using inflation - points added directly into mesh)
     autoPtr<mapPolyMesh> topoChangeMap = topoChanger_.changeMesh(false);
 
-    if (topoChangeMap.valid())
+    if (topoChangeMap)
     {
         Info << "Executing mesh topology update" << endl;
         motionPtr_->updateMesh(topoChangeMap());
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
index 4c157ccbda..9abc753a4e 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -304,7 +304,7 @@ void Foam::linearValveFvMesh::update()
 
     msPtr_->updateMesh();
 
-    if (topoChangeMap.valid())
+    if (topoChangeMap)
     {
         if (topoChangeMap().hasMotionPoints())
         {
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index a9c5add2ff..67ff38baa8 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -365,7 +365,7 @@ void Foam::linearValveLayersFvMesh::update()
     setMorphTimeIndex(3*time().timeIndex() + 1);
     updateMesh();
 
-    if (topoChangeMap.valid())
+    if (topoChangeMap)
     {
         if (topoChangeMap().hasMotionPoints())
         {
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index 5720ebe4d1..3667265d29 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -333,7 +333,7 @@ bool Foam::mixerFvMesh::update()
     // Make changes. Use inflation (so put new points in topoChangeMap)
     autoPtr<mapPolyMesh> topoChangeMap = topoChanger_.changeMesh(true);
 
-    if (topoChangeMap.valid())
+    if (topoChangeMap)
     {
         DebugInFunction << "Mesh topology is changing" << nl;
 
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index 4907e89cd2..58014383c7 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -321,7 +321,7 @@ bool Foam::movingConeTopoFvMesh::update()
         << " curLeft:" << curLeft_ << " curRight:" << curRight_
         << endl;
 
-    if (topoChangeMap.valid())
+    if (topoChangeMap)
     {
         Info<< "Topology change. Calculating motion points" << endl;
 
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
index 6c0f7b2f42..6a19f964e2 100644
--- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,7 +76,7 @@ bool Foam::rawTopoChangerFvMesh::update()
     // Do any topology changes. Sets topoChanging (through polyTopoChange)
     autoPtr<mapPolyMesh> topoChangeMap = topoChanger_.changeMesh(true);
 
-    bool hasChanged = topoChangeMap.valid();
+    const bool hasChanged = bool(topoChangeMap);
 
     if (hasChanged)
     {