From 7e270fc482bb821e542decd66a032e9acc7d77bd Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 29 May 2018 09:57:30 +0200
Subject: [PATCH 01/13] STYLE: formatting of scotch options

---
 src/parallel/decompose/ptscotchDecomp/Make/options | 10 ++++------
 src/parallel/decompose/scotchDecomp/Make/options   |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index 0fcafd2559..733441c3fc 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -3,9 +3,9 @@ sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
-    -I../decompositionMethods/lnInclude \
+    -I$(SCOTCH_INC_DIR) \
     -I$(SCOTCH_ARCH_PATH)/include/$(FOAM_MPI) \
-    -I$(SCOTCH_INC_DIR)
+    -I../decompositionMethods/lnInclude
 
 /*
  * The '-lscotch' is a slight hack:
@@ -15,7 +15,5 @@ LIB_LIBS = \
     -L$(SCOTCH_LIB_DIR) \
     -L$(FOAM_EXT_LIBBIN) \
     -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) \
-    -lptscotch \
-    -lptscotcherrexit \
-    -lscotch \
-    -lrt
+    -lptscotch -lptscotcherrexit \
+    -lscotch -lrt
diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
index d98ed6ce43..d2165b174d 100644
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@@ -11,4 +11,5 @@ EXE_INC = \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -L$(SCOTCH_LIB_DIR) -lscotch -lscotcherrexit -lrt
+    -L$(SCOTCH_LIB_DIR) \
+    -lscotch -lscotcherrexit -lrt

From 30309e9a6587f44fe1ca996b3246e0e154d358bc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 29 May 2018 11:16:20 +0200
Subject: [PATCH 02/13] COMP: 64-bit label ambiguity

---
 src/fileFormats/ensight/file/ensightCase.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fileFormats/ensight/file/ensightCase.C b/src/fileFormats/ensight/file/ensightCase.C
index 310c3bda73..dd97fa5705 100644
--- a/src/fileFormats/ensight/file/ensightCase.C
+++ b/src/fileFormats/ensight/file/ensightCase.C
@@ -508,7 +508,7 @@ void Foam::ensightCase::write() const
     }
     if (tsCloud < 0)
     {
-        tsCloud = 1 + std::max(1, tsGeom);  // Next available timeset
+        tsCloud = 1 + std::max(label(1), tsGeom);  // Next available timeset
     }
 
     writeHeader();

From bd33a382ee7730cd708da0743c583dd04e86e85d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 29 May 2018 08:56:08 +0200
Subject: [PATCH 03/13] COMP: define additional UIndirectList iterator member
 types (closes #847)

- required for std::iterator_traits specialization, which is used by
  the std::max_element algorithm on Darwin.
---
 .../containers/Lists/UIndirectList/UIndirectList.H | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
index a797dfec52..7c3191f936 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
@@ -190,6 +190,12 @@ public:
 
         public:
 
+            using difference_type = label;
+            using value_type = T;
+            using pointer = T*;
+            using reference = T&;
+            using iterator_category = std::forward_iterator_tag;
+
             iterator
             (
                 UList<T>& list,
@@ -231,6 +237,12 @@ public:
 
         public:
 
+            using difference_type = label;
+            using value_type = const T;
+            using pointer = const T*;
+            using reference = const T&;
+            using iterator_category = std::forward_iterator_tag;
+
             const_iterator
             (
                 const UList<T>& list,
@@ -241,7 +253,7 @@ public:
                 base_(baseIter)
             {}
 
-            const_reference operator*() const
+            reference operator*() const
             {
                 return data_[*base_];
             }

From 5e9ba0bc7269bfe62e13b894701a34c71b741b0f Mon Sep 17 00:00:00 2001
From: Alexey Matveichev <alexey@matveichev.com>
Date: Tue, 29 May 2018 11:21:59 +0200
Subject: [PATCH 04/13] ENH: Darwin emulation for addr2line

---
 .../miscellaneous/OSspecific/Allwmake         |  13 ++
 .../OSspecific/addr2line/Make/files           |   3 +
 .../OSspecific/addr2line/Make/options         |   3 +
 .../OSspecific/addr2line/addr2line.C          | 208 ++++++++++++++++++
 4 files changed, 227 insertions(+)
 create mode 100755 applications/utilities/miscellaneous/OSspecific/Allwmake
 create mode 100644 applications/utilities/miscellaneous/OSspecific/addr2line/Make/files
 create mode 100644 applications/utilities/miscellaneous/OSspecific/addr2line/Make/options
 create mode 100644 applications/utilities/miscellaneous/OSspecific/addr2line/addr2line.C

diff --git a/applications/utilities/miscellaneous/OSspecific/Allwmake b/applications/utilities/miscellaneous/OSspecific/Allwmake
new file mode 100755
index 0000000000..cf32b145ce
--- /dev/null
+++ b/applications/utilities/miscellaneous/OSspecific/Allwmake
@@ -0,0 +1,13 @@
+#!/bin/sh
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/wmake/scripts/sysFunctions
+
+#------------------------------------------------------------------------------
+
+if isDarwin
+then
+    echo "==> Darwin-specific utilities"
+    wmake addr2line
+fi
+
+#------------------------------------------------------------------------------
diff --git a/applications/utilities/miscellaneous/OSspecific/addr2line/Make/files b/applications/utilities/miscellaneous/OSspecific/addr2line/Make/files
new file mode 100644
index 0000000000..a3dc48dff5
--- /dev/null
+++ b/applications/utilities/miscellaneous/OSspecific/addr2line/Make/files
@@ -0,0 +1,3 @@
+addr2line.C
+
+EXE = $(FOAM_APPBIN)/addr2line
diff --git a/applications/utilities/miscellaneous/OSspecific/addr2line/Make/options b/applications/utilities/miscellaneous/OSspecific/addr2line/Make/options
new file mode 100644
index 0000000000..4c3dd783cb
--- /dev/null
+++ b/applications/utilities/miscellaneous/OSspecific/addr2line/Make/options
@@ -0,0 +1,3 @@
+EXE_INC =
+
+EXE_LIBS =
diff --git a/applications/utilities/miscellaneous/OSspecific/addr2line/addr2line.C b/applications/utilities/miscellaneous/OSspecific/addr2line/addr2line.C
new file mode 100644
index 0000000000..6ebd7b0d59
--- /dev/null
+++ b/applications/utilities/miscellaneous/OSspecific/addr2line/addr2line.C
@@ -0,0 +1,208 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 Alexey Matveichev
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    addr2line
+
+Description
+    A simple, partial emulation of addr2line utility for Mac-OS.
+
+\*---------------------------------------------------------------------------*/
+
+#include <getopt.h>
+#include <cstdlib>
+#include <string>
+#include <vector>
+#include <iostream>
+
+#include "regExp.H"
+#include "SubStrings.H"
+
+static void usage();
+static void version();
+static std::string getLine(const std::string&, const std::string&);
+static std::string pOpen(const std::string&, int line=0);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    int optHelp = 0, optFunctions = 0, optVersion = 0;
+    int ch;
+    std::string filename = "a.out";
+    std::vector<std::string> addresses;
+
+    static struct option opts[] =
+    {
+        { "target", required_argument, nullptr, 'b' },
+        { "demangle", required_argument, nullptr, 'C' },
+        { "exe", required_argument, nullptr, 'e' },
+        { "functions", no_argument, &optFunctions, 1 },
+        { "version", no_argument, &optVersion, 1 },
+        { "basename", no_argument, nullptr, 's' },
+        { "inlines", no_argument, nullptr, 'i' },
+        { "section", required_argument, nullptr, 'j' },
+        { "help", no_argument, &optHelp, 1 },
+        { nullptr, 0, nullptr, 0 }
+    };
+
+    while ((ch = getopt_long(argc, argv, "b:C:e:fVsij:H", opts, nullptr)) != -1)
+    {
+        switch (ch)
+        {
+            case 'e':
+                filename = std::string(optarg);
+                break;
+            case 'C':
+                // Ignoring this flag for now
+                break;
+            case 'f':
+                // Functions are demangled in printStack
+                break;
+            case 0:
+                if (optHelp) usage();
+                if (optVersion) version();
+                break;
+            default:
+                usage();
+                break;
+        }
+    }
+
+    if (optind >= argc)
+    {
+        usage();
+    }
+
+    argc -= optind;
+    argv += optind;
+
+    while (argc > 0)
+    {
+        addresses.push_back(std::string(*argv));
+        ++argv;
+        --argc;
+    }
+
+    for (const auto& addr : addresses)
+    {
+        std::cout<< '\n' << getLine(filename, addr).c_str() << '\n';
+    }
+
+    return 0;
+}
+
+
+void usage()
+{
+    std::cout
+        << "usage: addr2line [-e filename|--exe=filename]"
+           " address [address...]\n" << std::endl;
+    ::exit(1);
+}
+
+
+void version()
+{
+    std::cout<< "OpenFOAM addr2line emulator\n" << std::endl;
+    ::exit(0);
+}
+
+
+std::string pOpen(const std::string& cmd, int line)
+{
+    std::string res;
+
+    FILE* cmdPipe = popen(cmd.c_str(), "r");
+    if (!cmdPipe) return res;
+
+    char* buf = nullptr;
+
+    // Read line number of lines
+    for (int cnt = 0; cnt <= line; ++cnt)
+    {
+        size_t linecap = 0;
+        ssize_t linelen = ::getline(&buf, &linecap, cmdPipe);
+
+        if (linelen < 0)
+        {
+            break;
+        }
+
+        if (cnt == line)
+        {
+            res = std::string(buf);
+
+            // Trim trailing newline
+            if (res.size())
+            {
+                res.resize(res.size()-1);
+            }
+            break;
+        }
+    }
+
+    if (buf) free(buf);
+
+    pclose(cmdPipe);
+
+    return res;
+}
+
+
+std::string getLine(const std::string& filename, const std::string& addr)
+{
+    std::string line =
+        pOpen
+        (
+            "echo 'image lookup -va " + addr
+          + "'"
+          + " | xcrun lldb "
+          + "-O 'target create --no-dependents -a x86_64 "
+          + filename
+          + "' -o '"
+          + "target module load -f "
+          + filename
+          + " __TEXT 0x0' 2> /dev/null"
+          + " | grep LineEntry"
+        );
+
+
+    Foam::regExp re(".+LineEntry: .+: (.+):([0-9]+):[0-9]+");
+
+    Foam::regExp::results_type groups;
+    if (!re.match(line, groups))
+    {
+        line = "??:0";
+    }
+    else
+    {
+        line = groups[1].str() + ":" + groups[2].str();
+    }
+
+    return line;
+}
+
+
+// ************************************************************************* //

From 3de9b2f6754cb7a67a0d7ed593c82aaf56f35415 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 29 May 2018 12:36:12 +0200
Subject: [PATCH 05/13] COMP: resolve size ambiguity (Darwin)

---
 BuildIssues.txt                               | 30 +++++++++++++++++++
 .../insertSurfaceNearestPointPairs.C          |  4 +--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/BuildIssues.txt b/BuildIssues.txt
index a05b5301c3..e995ea5105 100644
--- a/BuildIssues.txt
+++ b/BuildIssues.txt
@@ -118,4 +118,34 @@ your `~/.spack/packages.yaml` file:
 It appears that spack will otherwise ignore any paraview+qt version
 and attempt to install a paraview~qt version instead.
 
+---------------------------
+Building on Darwin (Mac-OS)
+---------------------------
+
+Support for Darwin is incomplete, but has been provisioned for.
+
+The following are typical (as of yet) unresolved issues.
+
+* Scotch, ptscotch:
+  - The librt linkage is required for Linux, but not for Darwin.
+
+  Current resolution:
+  Edit or patch
+      src/parallel/decompose/ptscotchDecomp/Make/options
+      src/parallel/decompose/scotchDecomp/Make/options
+
+  to remove the '-lrt' library
+
+* CGAL:
+  - ThirdParty CGAL will normally need to be compiled without mpfr/gmp.
+    This should be done manually prior to building OpenFOAM or other
+    ThirdParty. Eg,
+
+        cd $WM_THIRD_PARTY_DIR
+        ./makeCGAL gmp-none mpfr-none
+
+  The erroneous references to gmp/mpfr library can be directly removed
+  from the wmake/rules/General/CGAL, but it is more advisable to
+  override them instead in the wmake/rules/darwin64Clang/CGAL file.
+
 --
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertSurfaceNearestPointPairs.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertSurfaceNearestPointPairs.C
index f15a02a01d..7578920f82 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertSurfaceNearestPointPairs.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertSurfaceNearestPointPairs.C
@@ -144,8 +144,8 @@ void Foam::CV2D::insertSurfaceNearestPointPairs()
     label nSurfacePointsEst =
         min
         (
-            number_of_vertices(),
-            size_t(10*sqrt(scalar(number_of_vertices())))
+            label(number_of_vertices()),
+            label(10*sqrt(scalar(number_of_vertices())))
         );
 
     DynamicList<point2D> nearSurfacePoints(nSurfacePointsEst);

From 6b6b36afd3999c741840b0b98392610a0864fda9 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 29 May 2018 17:38:02 +0200
Subject: [PATCH 06/13] STYLE: revert bitSet/HashSet setMany() to set() method
 (issue #837)

- improves backward compatibility and more naming consistency.
  Retain setMany(iter1, iter2) to avoid ambiguity with the
  PackedList::set(index, value) method.
---
 applications/test/HashSet/Test-hashSet.C      |  6 +--
 applications/test/bitSet2/Test-bitSet2.C      |  2 +-
 applications/test/edges/Test-edges.C          |  6 +--
 .../mesh/advanced/modifyMesh/cellSplitter.C   |  2 +-
 .../refineWallLayer/refineWallLayer.C         |  4 +-
 .../refinementLevel/refinementLevel.C         |  2 +-
 .../mesh/advanced/splitCells/splitCells.C     |  2 +-
 .../ideasUnvToFoam/ideasUnvToFoam.C           |  2 +-
 .../conversion/writeMeshObj/writeMeshObj.C    |  2 +-
 .../extrude/extrudeMesh/extrudeMesh.C         |  2 +-
 .../extrudeToRegionMesh/extrudeToRegionMesh.C |  4 +-
 .../conformalVoronoiMeshCalcDualMesh.C        | 16 +++----
 .../conformalVoronoiMeshIO.C                  |  2 +-
 .../manipulation/polyDualMesh/meshDualiser.C  |  2 +-
 .../mesh/manipulation/refineMesh/refineMesh.C |  2 +-
 .../mesh/manipulation/splitMesh/regionSide.C  |  2 +-
 .../decomposePar/decomposePar.C               |  2 +-
 .../decomposePar/domainDecompositionMesh.C    |  2 +-
 .../reconstructPar/reconstructPar.C           |  2 +-
 .../PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C |  2 +-
 .../createZeroDirectory/boundaryInfo.C        |  2 +-
 .../surfaceMeshTriangulate.C                  |  2 +-
 modules/catalyst                              |  2 +-
 src/OpenFOAM/containers/Bits/bitSet/bitSet.H  | 42 ++++++++++++-------
 src/OpenFOAM/containers/Bits/bitSet/bitSetI.H | 16 +++----
 .../containers/Bits/bitSet/bitSetTemplates.C  | 22 ++++++++--
 .../containers/HashTables/HashSet/HashSet.C   | 14 +++----
 .../containers/HashTables/HashSet/HashSet.H   | 38 ++++++++++-------
 .../HashTables/HashTable/HashTable.C          |  8 ++--
 .../HashTables/HashTable/HashTable.H          |  4 +-
 .../functionObjectList/functionObjectList.C   |  4 +-
 src/OpenFOAM/meshes/meshShapes/edge/edge.H    | 36 ++++++++--------
 src/OpenFOAM/meshes/meshShapes/edge/edgeI.H   |  8 ++--
 .../polyBoundaryMesh/polyBoundaryMesh.C       |  4 +-
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C |  2 +-
 .../primitiveMesh/primitiveMeshCellPoints.C   |  2 +-
 .../meshes/primitiveMesh/primitiveMeshEdges.C |  2 +-
 src/conversion/vtk/part/foamVtuSizing.C       |  2 +-
 .../vtk/part/foamVtuSizingTemplates.C         |  2 +-
 .../attachDetach/detachInterface.C            |  6 +--
 .../fvMeshDistribute/fvMeshDistribute.C       |  2 +-
 .../motionSmoother/motionSmootherAlgo.C       | 12 +++---
 .../perfectInterface/perfectInterface.C       |  2 +-
 .../polyTopoChange/edgeCollapser.C            | 10 ++---
 .../polyTopoChange/hexRef8/hexRef8.C          | 10 ++---
 .../polyTopoChange/removePoints.C             |  2 +-
 .../slidingInterface/coupleSlidingInterface.C |  6 +--
 .../slidingInterfaceProjectPoints.C           |  2 +-
 src/fileFormats/ensight/file/ensightCase.C    |  2 +-
 .../faMesh/faMeshDemandDrivenData.C           |  2 +-
 .../fieldSelection/fieldSelectionTemplates.C  |  2 +-
 .../fileFieldSelectionTemplates.C             |  2 +-
 .../isoAdvection/isoAdvection/isoAdvection.C  |  4 +-
 .../globalIndexStencils/cellToCellStencil.C   |  2 +-
 .../globalIndexStencils/cellToFaceStencil.C   | 12 +++---
 .../field/turbulenceFields/turbulenceFields.C |  2 +-
 .../ParticleErosion/ParticleErosion.C         |  2 +-
 .../PatchPostProcessing/PatchPostProcessing.C |  2 +-
 .../meshRefinement/meshRefinement.C           |  2 +-
 .../meshRefinement/meshRefinementBaffles.C    |  4 +-
 .../meshRefinement/meshRefinementMerge.C      |  6 +--
 .../snappyHexMeshDriver/snappyLayerDriver.C   |  4 +-
 .../snappyHexMeshDriver/snappySnapDriver.C    | 10 ++---
 .../cellClassification/cellClassification.C   |  2 +-
 src/meshTools/cellDist/cellDistFuncs.C        |  2 +-
 .../extendedEdgeMesh/extendedEdgeMesh.C       |  4 +-
 src/meshTools/indexedOctree/treeDataFace.C    |  2 +-
 src/meshTools/meshTools/meshTools.C           |  2 +-
 .../faceSources/normalToFace/normalToFace.C   |  6 +--
 .../triSurfaceTools/triSurfaceTools.C         |  2 +-
 .../cellVolumeWeightCellCellStencil.C         |  4 +-
 .../structuredDecomp/structuredDecomp.C       |  2 +-
 .../structuredRenumber/structuredRenumber.C   |  2 +-
 src/sampling/probes/probes.C                  | 20 ++++-----
 .../surfMeshSamplers/surfMeshSamplers.C       | 10 ++---
 src/sampling/surface/isoSurface/isoSurface.C  |  4 +-
 .../surface/isoSurface/isoSurfaceCell.C       |  2 +-
 src/surfMesh/triSurface/triSurfaceIO.C        |  2 +-
 src/surfMesh/triSurface/triSurfaceStitch.C    |  2 +-
 79 files changed, 243 insertions(+), 213 deletions(-)

diff --git a/applications/test/HashSet/Test-hashSet.C b/applications/test/HashSet/Test-hashSet.C
index 5316f05e3f..eeae7ff0d0 100644
--- a/applications/test/HashSet/Test-hashSet.C
+++ b/applications/test/HashSet/Test-hashSet.C
@@ -188,10 +188,10 @@ int main(int argc, char *argv[])
     Info<< "setB : " << setB << endl;
 
     labelPair pair(12, 15);
-    setB.setMany(pair);
+    setB.set(pair);
 
     Info<< "setB : " << setB << endl;
-    setB.unsetMany(pair);
+    setB.unset(pair);
 
 
     labelHashSet setC(1);
@@ -257,7 +257,7 @@ int main(int argc, char *argv[])
         someLst[elemI] = elemI*elemI;
     }
 
-    label added = setD.setMany(someLst);
+    label added = setD.set(someLst);
     Info<< "added " << added << " from " << someLst.size() << endl;
     Info<< "setD : " << flatOutput(setD) << endl;
 
diff --git a/applications/test/bitSet2/Test-bitSet2.C b/applications/test/bitSet2/Test-bitSet2.C
index b76048b01d..71b8992a68 100644
--- a/applications/test/bitSet2/Test-bitSet2.C
+++ b/applications/test/bitSet2/Test-bitSet2.C
@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nclear/assign from labelList\n";
     list4.clear();
-    list4.setMany(labelList{0, 1, 2, 3, 12, 13, 14, 19, 20, 21});
+    list4.set(labelList{0, 1, 2, 3, 12, 13, 14, 19, 20, 21});
 
     report(list4, true);
 
diff --git a/applications/test/edges/Test-edges.C b/applications/test/edges/Test-edges.C
index 68de5446ee..51da417de3 100644
--- a/applications/test/edges/Test-edges.C
+++ b/applications/test/edges/Test-edges.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
     e4.start() = e4.end() = -1;
     Info<< "insert from list\n";
     labelHashSet newIndices({2, -1, 2, 1, 4, 1, 2, 3});
-    e4.insertMany(newIndices.toc());
+    e4.insert(newIndices.toc());
     printInfo(e4);
 
     e4.start() = e4.end() = -1;
@@ -105,12 +105,12 @@ int main(int argc, char *argv[])
     FixedList<label, 8> otherIndices{12, 2, -1, 1, 4, 1, 2, 3};
     e4.start() = e4.end() = -1;
     Info<< "insert from list: " << otherIndices << nl;
-    e4.insertMany(otherIndices);
+    e4.insert(otherIndices);
     printInfo(e4);
 
     e4.start() = e4.end();
     Info<< "erase from list: " << otherIndices << nl;
-    Info<< "removed " << e4.eraseMany(otherIndices) << " values" << nl;
+    Info<< "removed " << e4.erase(otherIndices) << " values" << nl;
     printInfo(e4);
 
     for (label i : {-1, 0, 1, 3})
diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
index 280c8b1f3b..a39690325b 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
@@ -374,7 +374,7 @@ void Foam::cellSplitter::setRefinement
 
         const cell& cFaces = mesh_.cells()[celli];
 
-        faceUpToDate.unsetMany(cFaces);
+        faceUpToDate.unset(cFaces);
     }
 
     forAll(faceUpToDate, facei)
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index 30efaf9ecc..0f8b5c1ed0 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
         {
             const labelList& pCells = mesh.pointCells()[meshPointi];
 
-            cutCells.insertMany(pCells);
+            cutCells.insert(pCells);
         }
     }
 
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
         const polyPatch& pp = mesh.boundaryMesh()[patchi];
         const labelList& meshPoints = pp.meshPoints();
 
-        vertOnPatch.setMany(meshPoints);
+        vertOnPatch.set(meshPoints);
     }
 
     for (const label patchi : patchSet)
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index 0b3db1f187..34a22e98c4 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
         const DynamicList<label>& bin = bins[binI];
 
         cellSet cells(mesh, "vol" + name(binI), bin.size());
-        cells.insertMany(bin);
+        cells.insert(bin);
 
         Info<< "    " << lowerLimits[binI] << " .. " << upperLimits[binI]
             << "  : writing " << bin.size() << " cells to cellSet "
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 6bd54ba6d9..8328bd429b 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -633,7 +633,7 @@ int main(int argc, char *argv[])
         );
 
         cellSet cutSet(mesh, "cutSet", cutCells.size());
-        cutSet.insertMany(cutCells);
+        cutSet.insert(cutCells);
 
         // Gets cuts across cells from cuts through edges.
         Info<< "Writing " << cutSet.size() << " cells to cut to cellSet "
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 021ac49b87..c49d3e3664 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -956,7 +956,7 @@ int main(int argc, char *argv[])
         forAll(dofVertIndices, patchi)
         {
             const labelList& foamVerts = dofVertIndices[patchi];
-            dofGroups[patchi].insertMany(foamVerts);
+            dofGroups[patchi].insert(foamVerts);
         }
 
         List<DynamicList<face>> dynPatchFaces(dofVertIndices.size());
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index 8530d69541..bb34fe5a13 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -344,7 +344,7 @@ void writePointCells
     {
         const labelList& cEdges = mesh.cellEdges()[pCells[i]];
 
-        allEdges.insertMany(cEdges);
+        allEdges.insert(cEdges);
     }
 
 
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 5b11187ee7..34d5f2b5c6 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -795,7 +795,7 @@ int main(int argc, char *argv[])
             forAll(addedCells, facei)
             {
                 const labelList& aCells = addedCells[facei];
-                addedCellsSet.insertMany(aCells);
+                addedCellsSet.insert(aCells);
             }
         }
     }
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index c22514d248..3251cc203a 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -527,7 +527,7 @@ label findUncoveredPatchFace
 {
     // Make set of extruded faces.
     labelHashSet extrudeFaceSet(extrudeMeshFaces.size());
-    extrudeFaceSet.insertMany(extrudeMeshFaces);
+    extrudeFaceSet.insert(extrudeMeshFaces);
 
     const polyBoundaryMesh& pbm = mesh.boundaryMesh();
     const labelList& eFaces = mesh.edgeFaces()[meshEdgeI];
@@ -561,7 +561,7 @@ label findUncoveredCyclicPatchFace
 {
     // Make set of extruded faces.
     labelHashSet extrudeFaceSet(extrudeMeshFaces.size());
-    extrudeFaceSet.insertMany(extrudeMeshFaces);
+    extrudeFaceSet.insert(extrudeMeshFaces);
 
     const polyBoundaryMesh& pbm = mesh.boundaryMesh();
     const labelList& eFaces = mesh.edgeFaces()[meshEdgeI];
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 7fcbfffd10..154c10ff63 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -1053,7 +1053,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
 
                 nInvalidPolyhedra++;
 
-                wrongFaces.insertMany(cells[cI]);
+                wrongFaces.insert(cells[cI]);
             }
         }
 
@@ -1093,7 +1093,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
             if (nInternalFaces[cI] <= 1)
             {
                 oneInternalFaceCells++;
-                wrongFaces.insertMany(cells[cI]);
+                wrongFaces.insert(cells[cI]);
             }
         }
 
@@ -1109,7 +1109,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
     {
         const face f = pMesh.faces()[facei];
 
-        ptToBeLimited.setMany(f);
+        ptToBeLimited.set(f);
     }
 
     // // Limit connected cells
@@ -1126,7 +1126,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
     //     {
     //         label ptI = f[fPtI];
     //         const labelList& pC = ptCells[ptI];
-    //         limitCells.insertMany(pC);
+    //         limitCells.insert(pC);
     //     }
     // }
 
@@ -1136,7 +1136,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
     // {
     //     const labelList& cP = cellPts[celli];
 
-    //     ptToBeLimited.setMany(cP);
+    //     ptToBeLimited.set(cP);
     // }
 
 
@@ -2537,7 +2537,7 @@ void Foam::conformalVoronoiMesh::removeUnusedPoints
     {
         const face& f = faces[fI];
 
-        ptUsed.setMany(f);
+        ptUsed.set(f);
     }
 
     label pointi = 0;
@@ -2587,8 +2587,8 @@ Foam::labelList Foam::conformalVoronoiMesh::removeUnusedCells
 
     // Scan all faces to find all of the cells that are used
 
-    cellUsed.setMany(owner);
-    cellUsed.setMany(neighbour);
+    cellUsed.set(owner);
+    cellUsed.set(neighbour);
 
     label celli = 0;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index f8a285717c..cce1bce14d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -1369,7 +1369,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findRemainingProtrusionSet
     for (const label pointi : protrudingBoundaryPoints)
     {
         const labelList& pCells = mesh.pointCells()[pointi];
-        protrudingCells.insertMany(pCells);
+        protrudingCells.insert(pCells);
     }
 
     label protrudingCellsSize = protrudingCells.size();
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index a586daad68..cef8d2695b 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -891,7 +891,7 @@ void Foam::meshDualiser::setRefinement
     {
         const labelList& fEdges = mesh_.faceEdges()[facei];
 
-        isBoundaryEdge.setMany(fEdges);
+        isBoundaryEdge.set(fEdges);
     }
 
 
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index c4b0c01b6d..f55d773b9b 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -349,7 +349,7 @@ int main(int argc, char *argv[])
     forAll(oldToNew, oldCelli)
     {
         const labelList& added = oldToNew[oldCelli];
-        newCells.insertMany(added);
+        newCells.insert(added);
     }
 
     Info<< "Writing refined cells ("
diff --git a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
index b3308984d0..0a2a9d2c0f 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
@@ -300,7 +300,7 @@ void Foam::regionSide::walkAllPointConnectedFaces
     {
         const labelList& fEdges = mesh.faceEdges()[facei];
 
-        regionEdges.insertMany(fEdges);
+        regionEdges.insert(fEdges);
     }
 
 
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index fa0dd946bd..0ac8b9af1b 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -311,7 +311,7 @@ int main(int argc, char *argv[])
         wordHashSet names;
         forAllConstIters(rp, iter)
         {
-            names.insertMany(iter.object());
+            names.insert(iter.object());
         }
 
         regionNames = names.sortedToc();
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index 9285d85a07..bc8a8f5b1a 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -451,7 +451,7 @@ void Foam::domainDecomposition::decomposeMesh()
             const labelList& facePoints = fcs[mag(facei) - 1];
 
             // Mark the face points as being used
-            pointsInUse.setMany(facePoints);
+            pointsInUse.set(facePoints);
         }
 
         procPointAddressing_[proci] = pointsInUse.sortedToc();
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index c8ab33cfa2..cdd092b127 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
         wordHashSet names;
         forAllConstIters(rp, iter)
         {
-            names.insertMany(iter.object());
+            names.insert(iter.object());
         }
 
         regionNames = names.sortedToc();
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C
index 91f8ef7c3c..9a70ef0205 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C
@@ -227,7 +227,7 @@ void Foam::vtkPVFoam::updateInfoLagrangian
 
     for (const instant& t : dbPtr_().times())
     {
-        names.insertMany
+        names.insert
         (
             readDir
             (
diff --git a/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C b/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C
index 16671a4ec2..a44a906664 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C
+++ b/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C
@@ -123,7 +123,7 @@ Foam::boundaryInfo::boundaryInfo(const Time& runTime, const word& regionName)
         if (dict.found("inGroups"))
         {
             dict.lookup("inGroups") >> groups_[patchI];
-            allGroupNames_.insertMany(groups_[patchI]);
+            allGroupNames_.insert(groups_[patchI]);
         }
     }
 }
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index fe1f63ffb8..936a90a2df 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
             for (const wordRe& zoneName : zoneNames)
             {
                 labelList zoneIDs = findStrings(zoneName, allZoneNames);
-                includeFaceZones.insertMany(zoneIDs);
+                includeFaceZones.insert(zoneIDs);
 
                 if (zoneIDs.empty())
                 {
diff --git a/modules/catalyst b/modules/catalyst
index d31e13e12b..eaa7f6836a 160000
--- a/modules/catalyst
+++ b/modules/catalyst
@@ -1 +1 @@
-Subproject commit d31e13e12b4d9b727b28d39bc34086f2cb75acfa
+Subproject commit eaa7f6836a1950fe8d40c13952aa85a1062f7f91
diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
index b2763c339e..38b0181a82 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
@@ -262,7 +262,7 @@ public:
 
     // Setting single or multiple values
 
-        //- Single index/value assign
+        //- Assign a single index/value
         using PackedList<1>::set;
 
         //- Set specified bits from another bitset.
@@ -346,29 +346,41 @@ public:
         //  Either increases the size of the bitSet or is a no-op.
         inline bitSet& extend(const bitSet& other);
 
-        //- Set the listed locations to true.
-        //  Does auto-vivify for non-existent entries.
-        inline void setMany(const labelUList& locations);
-
-        //- Set the listed locations to true.
-        //  Does auto-vivify for non-existent entries.
-        inline void setMany(const labelUIndList& locations);
-
         //- Set the locations listed by the iterator range,
         //  auto-vivify entries if needed.
+        //
+        //  \return number of locations changed
         template<class InputIter>
-        void setMany(InputIter first, InputIter last);
+        label setMany(InputIter first, InputIter last);
 
-        //- Unset the listed locations, never auto-vivifies.
-        inline void unsetMany(const labelUList& locations);
+        //- Set the listed locations to true.
+        //  Does auto-vivify for non-existent entries.
+        //
+        //  \return number of locations changed
+        inline label set(const labelUList& locations);
 
-        //- Unset the listed locations, never auto-vivifies.
-        inline void unsetMany(const labelUIndList& locations);
+        //- Set the listed locations to true.
+        //  Does auto-vivify for non-existent entries.
+        //
+        //  \return number of locations changed
+        inline label set(const labelUIndList& locations);
 
         //- Unset the locations listed by the iterator range,
         //- never auto-vivify entries.
+        //
+        //  \return number of locations changed
         template<class InputIter>
-        void unsetMany(InputIter first, InputIter last);
+        label unset(InputIter first, InputIter last);
+
+        //- Unset the listed locations, never auto-vivifies.
+        //
+        //  \return number of locations changed
+        inline label unset(const labelUList& locations);
+
+        //- Unset the listed locations, never auto-vivifies.
+        //
+        //  \return number of locations changed
+        inline label unset(const labelUIndList& locations);
 
 
     // Access helpers
diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H b/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H
index fd52a8c866..454fc2b76c 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H
@@ -531,27 +531,27 @@ inline void Foam::bitSet::set(const bitSet& bitset)
 }
 
 
-inline void Foam::bitSet::setMany(const labelUList& locations)
+inline Foam::label Foam::bitSet::set(const labelUList& locations)
 {
-    setMany(locations.begin(), locations.end());
+    return setMany(locations.begin(), locations.end());
 }
 
 
-inline void Foam::bitSet::setMany(const labelUIndList& locations)
+inline Foam::label Foam::bitSet::set(const labelUIndList& locations)
 {
-    setMany(locations.begin(), locations.end());
+    return setMany(locations.begin(), locations.end());
 }
 
 
-inline void Foam::bitSet::unsetMany(const labelUList& locations)
+inline Foam::label Foam::bitSet::unset(const labelUList& locations)
 {
-    unsetMany(locations.begin(), locations.end());
+    return unset(locations.begin(), locations.end());
 }
 
 
-inline void Foam::bitSet::unsetMany(const labelUIndList& locations)
+inline Foam::label Foam::bitSet::unset(const labelUIndList& locations)
 {
-    unsetMany(locations.begin(), locations.end());
+    return unset(locations.begin(), locations.end());
 }
 
 
diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C b/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C
index a8d5ac3256..e55cc6c77d 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C
@@ -28,31 +28,45 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class InputIter>
-void Foam::bitSet::setMany(InputIter first, InputIter last)
+Foam::label Foam::bitSet::setMany(InputIter first, InputIter last)
 {
     // Check the max expected value first
     const auto max = std::max_element(first, last);
     const label len = (max != last ? (1 + *max) : 0);
 
+    label changed = 0;
+
     if (len > 0)
     {
         reserve(len);
 
         for (; first != last; ++first)
         {
-            set(*first);
+            if (set(*first))
+            {
+                ++changed;
+            }
         }
     }
+
+    return changed;
 }
 
 
 template<class InputIter>
-void Foam::bitSet::unsetMany(InputIter first, InputIter last)
+Foam::label Foam::bitSet::unset(InputIter first, InputIter last)
 {
+    label changed = 0;
+
     for (; first != last; ++first)
     {
-        unset(*first);
+        if (unset(*first))
+        {
+            ++changed;
+        }
     }
+
+    return changed;
 }
 
 
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
index 90dcbea5eb..01b3f6a652 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
@@ -42,7 +42,7 @@ inline Foam::label Foam::HashSet<Key, Hash>::assignMany
 {
     if (!this->capacity())
     {
-        // Could be zero-sized from a previous transfer()?
+        // Zero-sized from a previous transfer()?
         this->resize(2*nItems);
     }
     else
@@ -155,7 +155,7 @@ inline Foam::label Foam::HashSet<Key, Hash>::insert
 
 template<class Key, class Hash>
 template<unsigned Size>
-inline Foam::label Foam::HashSet<Key, Hash>::insertMany
+inline Foam::label Foam::HashSet<Key, Hash>::insert
 (
     const FixedList<Key, Size>& list
 )
@@ -165,7 +165,7 @@ inline Foam::label Foam::HashSet<Key, Hash>::insertMany
 
 
 template<class Key, class Hash>
-inline Foam::label Foam::HashSet<Key, Hash>::insertMany
+inline Foam::label Foam::HashSet<Key, Hash>::insert
 (
     const UList<Key>& list
 )
@@ -175,7 +175,7 @@ inline Foam::label Foam::HashSet<Key, Hash>::insertMany
 
 
 template<class Key, class Hash>
-inline  Foam::label Foam::HashSet<Key, Hash>::insertMany
+inline  Foam::label Foam::HashSet<Key, Hash>::insert
 (
     const UIndirectList<Key>& list
 )
@@ -208,7 +208,7 @@ inline Foam::label Foam::HashSet<Key, Hash>::unset
 
 template<class Key, class Hash>
 template<unsigned Size>
-inline Foam::label Foam::HashSet<Key, Hash>::unsetMany
+inline Foam::label Foam::HashSet<Key, Hash>::unset
 (
     const FixedList<Key, Size>& list
 )
@@ -218,7 +218,7 @@ inline Foam::label Foam::HashSet<Key, Hash>::unsetMany
 
 
 template<class Key, class Hash>
-inline Foam::label Foam::HashSet<Key, Hash>::unsetMany
+inline Foam::label Foam::HashSet<Key, Hash>::unset
 (
     const UList<Key>& list
 )
@@ -228,7 +228,7 @@ inline Foam::label Foam::HashSet<Key, Hash>::unsetMany
 
 
 template<class Key, class Hash>
-inline Foam::label Foam::HashSet<Key, Hash>::unsetMany
+inline Foam::label Foam::HashSet<Key, Hash>::unset
 (
     const UIndirectList<Key>& list
 )
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index 343e4986d9..7208dd4c8b 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -204,15 +204,15 @@ public:
         //- Insert keys from the list of Key
         //  \return The number of new elements inserted
         template<unsigned Size>
-        inline label insertMany(const FixedList<Key, Size>& list);
+        inline label insert(const FixedList<Key, Size>& list);
 
         //- Insert keys from the list of Key
         //  \return The number of new elements inserted
-        inline label insertMany(const UList<Key>& list);
+        inline label insert(const UList<Key>& list);
 
         //- Insert keys from the list of Key
         //  \return The number of new elements inserted
-        inline label insertMany(const UIndirectList<Key>& list);
+        inline label insert(const UIndirectList<Key>& list);
 
         //- Same as insert (no value to overwrite)
         template<class InputIter>
@@ -229,27 +229,35 @@ public:
 
         //- Same as insert (no value to overwrite)
         template<unsigned Size>
-        inline label setMany(const FixedList<Key, Size>& list)
+        inline label set(const FixedList<Key, Size>& list)
         {
-            return insertMany(list);
+            return insert(list);
         }
 
-        //- Same as insertMany (no value to overwrite)
-        inline label setMany(const UList<Key>& list)
+        //- Same as insert (no value to overwrite)
+        inline label set(const UList<Key>& list)
         {
-            return insertMany(list);
+            return insert(list);
         }
 
-        //- Same as insertMany (no value to overwrite)
-        inline label setMany(const UIndirectList<Key>& list)
+        //- Same as insert (no value to overwrite)
+        inline label set(const UIndirectList<Key>& list)
         {
-            return insertMany(list);
+            return insert(list);
+        }
+
+        //- Same as insert (no value to overwrite)
+        //  \note Method name compatibility with bitSet
+        template<class InputIter>
+        inline label setMany(InputIter first, InputIter last)
+        {
+            return insert(first, last);
         }
 
         //- Unset the keys listed in the input iterator range
         //  \return The number of items removed
         template<class InputIter>
-        inline label unset(InputIter first, const InputIter last);
+        inline label unset(InputIter first, InputIter last);
 
         //- Unset the listed keys - same as erase
         //  \return The number of items removed
@@ -258,15 +266,15 @@ public:
         //- Unset the listed keys - same as erase
         //  \return The number of items removed
         template<unsigned Size>
-        inline label unsetMany(const FixedList<Key, Size>& list);
+        inline label unset(const FixedList<Key, Size>& list);
 
         //- Unset the listed keys - same as erase
         //  \return The number of items removed
-        inline label unsetMany(const UList<Key>& list);
+        inline label unset(const UList<Key>& list);
 
         //- Unset the listed keys - same as erase
         //  \return The number of items removed
-        inline label unsetMany(const UIndirectList<Key>& list);
+        inline label unset(const UIndirectList<Key>& list);
 
 
     // STL iterators
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index 7405064ffd..f00f2adb4b 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -444,7 +444,7 @@ inline Foam::label Foam::HashTable<T, Key, Hash>::erase
 
 template<class T, class Key, class Hash>
 template<unsigned Size>
-inline Foam::label Foam::HashTable<T, Key, Hash>::eraseMany
+inline Foam::label Foam::HashTable<T, Key, Hash>::erase
 (
     const FixedList<Key, Size>& keys
 )
@@ -454,7 +454,7 @@ inline Foam::label Foam::HashTable<T, Key, Hash>::eraseMany
 
 
 template<class T, class Key, class Hash>
-inline Foam::label Foam::HashTable<T, Key, Hash>::eraseMany
+inline Foam::label Foam::HashTable<T, Key, Hash>::erase
 (
     const UList<Key>& keys
 )
@@ -766,9 +766,9 @@ void Foam::HashTable<T, Key, Hash>::operator=
             << abort(FatalError);
     }
 
-    // Could be zero-sized from a previous transfer()
     if (!capacity_)
     {
+        // Zero-sized from a previous transfer()?
         resize(rhs.capacity_);
     }
     else
@@ -789,9 +789,9 @@ void Foam::HashTable<T, Key, Hash>::operator=
     std::initializer_list<std::pair<Key, T>> rhs
 )
 {
-    // Could be zero-sized from a previous transfer()
     if (!capacity_)
     {
+        // Zero-sized from a previous transfer()?
         resize(2*rhs.size());
     }
     else
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index cecd82083a..7b5e2afb2e 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -507,11 +507,11 @@ public:
         //- Remove table entries given by the listed keys
         //  \return The number of items removed
         template<unsigned Size>
-        inline label eraseMany(const FixedList<Key, Size>& keys);
+        inline label erase(const FixedList<Key, Size>& keys);
 
         //- Remove table entries given by the listed keys
         //  \return The number of items removed
-        inline label eraseMany(const UList<Key>& keys);
+        inline label erase(const UList<Key>& keys);
 
         //- Retain table entries given by keys of the other hash-table.
         //
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 86a07145d0..76ee09ff27 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -305,7 +305,7 @@ bool Foam::functionObjectList::readFunctionObject
     else if (args.size() > 1)
     {
         funcDict.set("fields", args);
-        requiredFields.insertMany(args);
+        requiredFields.insert(args);
     }
     else if (funcDict.found("field"))
     {
@@ -313,7 +313,7 @@ bool Foam::functionObjectList::readFunctionObject
     }
     else if (funcDict.found("fields"))
     {
-        requiredFields.insertMany(wordReList(funcDict.lookup("fields")));
+        requiredFields.insert(wordReList(funcDict.lookup("fields")));
     }
 
     // Insert named arguments
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edge.H b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
index 83e2b5ea30..6258fe8f98 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edge.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
@@ -181,12 +181,6 @@ public:
         //  Similar to a HashTable::insert().
         inline bool insert(const label index);
 
-        //- Fill open slots with the indices if they did not previously exist.
-        //  Returns true on success. Negative labels never insert.
-        //  Return the number of slots filled.
-        //  Similar to a HashTable::insert().
-        inline label insert(std::initializer_list<label> list);
-
         //- Insert values, using begin/end iterators.
         template<class InputIter>
         inline label insert(InputIter begIter, InputIter endIter);
@@ -194,15 +188,21 @@ public:
         //- Fill open slots with the indices if they did not previously exist.
         //  Returns true on success. Negative labels never insert.
         //  Return the number of slots filled.
-        //  Similar to a HashTable::insertMany().
-        template<unsigned Size>
-        inline label insertMany(const FixedList<label, Size>& list);
+        //  Similar to a HashTable::insert().
+        inline label insert(std::initializer_list<label> list);
 
         //- Fill open slots with the indices if they did not previously exist.
         //  Returns true on success. Negative labels never insert.
         //  Return the number of slots filled.
-        //  Similar to a HashTable::insertMany().
-        inline label insertMany(const labelUList& list);
+        //  Similar to a HashTable::insert().
+        template<unsigned Size>
+        inline label insert(const FixedList<label, Size>& list);
+
+        //- Fill open slots with the indices if they did not previously exist.
+        //  Returns true on success. Negative labels never insert.
+        //  Return the number of slots filled.
+        //  Similar to a HashTable::insert().
+        inline label insert(const labelUList& list);
 
 
         //- Remove an existing index from the edge and set its location to '-1'.
@@ -210,22 +210,22 @@ public:
         //  Similar to a HashTable::erase().
         inline label erase(const label index);
 
-        //- Remove existing indices from the edge and set locations to '-1'.
-        //  Returns the number of changes.
-        inline label erase(std::initializer_list<label> list);
-
         //- Remove values, using begin/end iterators.
         template<class InputIter>
         inline label erase(InputIter begIter, InputIter endIter);
 
         //- Remove existing indices from the edge and set locations to '-1'.
         //  Returns the number of changes.
-        template<unsigned Size>
-        inline label eraseMany(const FixedList<label, Size>& list);
+        inline label erase(std::initializer_list<label> list);
 
         //- Remove existing indices from the edge and set locations to '-1'.
         //  Returns the number of changes.
-        inline label eraseMany(const labelUList& list);
+        template<unsigned Size>
+        inline label erase(const FixedList<label, Size>& list);
+
+        //- Remove existing indices from the edge and set locations to '-1'.
+        //  Returns the number of changes.
+        inline label erase(const labelUList& list);
 
 
     // Geometric functions
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
index fcdaadc716..a9f3c39554 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
@@ -300,13 +300,13 @@ inline Foam::label Foam::edge::insert(std::initializer_list<label> list)
 
 
 template<unsigned Size>
-inline Foam::label Foam::edge::insertMany(const FixedList<label, Size>& list)
+inline Foam::label Foam::edge::insert(const FixedList<label, Size>& list)
 {
     return insert(list.begin(), list.end());
 }
 
 
-inline Foam::label Foam::edge::insertMany(const labelUList& list)
+inline Foam::label Foam::edge::insert(const labelUList& list)
 {
     return insert(list.begin(), list.end());
 }
@@ -366,13 +366,13 @@ inline Foam::label Foam::edge::erase(std::initializer_list<label> list)
 
 
 template<unsigned Size>
-inline Foam::label Foam::edge::eraseMany(const FixedList<label, Size>& list)
+inline Foam::label Foam::edge::erase(const FixedList<label, Size>& list)
 {
     return erase(list.begin(), list.end());
 }
 
 
-inline Foam::label Foam::edge::eraseMany(const labelUList& list)
+inline Foam::label Foam::edge::erase(const labelUList& list)
 {
     return erase(list.begin(), list.end());
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 745fcb4958..4b987064da 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -784,7 +784,7 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
         // Treat the given patch names as wild-cards and search the set
         // of all patch names for matches
         labelList patchIDs = findStrings(patchName, allPatchNames);
-        ids.insertMany(patchIDs);
+        ids.insert(patchIDs);
 
         if (patchIDs.empty())
         {
@@ -799,7 +799,7 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
                 {
                     const word& name = allGroupNames[groupIDs[i]];
                     const labelList& extraPatchIDs = groupPatchIDs()[name];
-                    ids.insertMany(extraPatchIDs);
+                    ids.insert(extraPatchIDs);
                 }
 
                 if (groupIDs.empty() && warnNotFound)
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index b4df8fd49d..9dc2bcc03f 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -445,7 +445,7 @@ Foam::bitSet Foam::ZoneMesh<ZoneType, MeshType>::findMatching
     const labelList indices = this->findIndices(key);
     forAll(indices, i)
     {
-        bitset.setMany
+        bitset.set
         (
             static_cast<const labelList&>(this->operator[](indices[i]))
         );
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
index 6f08ea4471..1902a3f386 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
@@ -74,7 +74,7 @@ const Foam::labelList& Foam::primitiveMesh::cellPoints
 
     for (const label facei : cFaces)
     {
-        set.insertMany(fcs[facei]);
+        set.insert(fcs[facei]);
     }
 
     storage.clear();
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
index 8f0d07e312..022de1979c 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
@@ -643,7 +643,7 @@ const Foam::labelList& Foam::primitiveMesh::cellEdges
 
     for (const label facei : cFaces)
     {
-        set.insertMany(faceEdges(facei));
+        set.insert(faceEdges(facei));
     }
 
     storage.clear();
diff --git a/src/conversion/vtk/part/foamVtuSizing.C b/src/conversion/vtk/part/foamVtuSizing.C
index 0bb9fb5592..417d19e854 100644
--- a/src/conversion/vtk/part/foamVtuSizing.C
+++ b/src/conversion/vtk/part/foamVtuSizing.C
@@ -165,7 +165,7 @@ void Foam::vtk::vtuSizing::reset
                 const face& f = mesh.faces()[facei];
                 nFaceLabels_ += f.size();
 
-                hashUniqId.insertMany(f);
+                hashUniqId.insert(f);
             }
 
             // Legacy format only uses the face-stream.
diff --git a/src/conversion/vtk/part/foamVtuSizingTemplates.C b/src/conversion/vtk/part/foamVtuSizingTemplates.C
index b070ab67da..40df139d2c 100644
--- a/src/conversion/vtk/part/foamVtuSizingTemplates.C
+++ b/src/conversion/vtk/part/foamVtuSizingTemplates.C
@@ -545,7 +545,7 @@ void Foam::vtk::vtuSizing::populateArrays
                 const face& f = mesh.faces()[cFaces[cFaceI]];
                 const bool isOwner = (owner[cFaces[cFaceI]] == celli);
 
-                hashUniqId.insertMany(f);
+                hashUniqId.insert(f);
 
                 // number of labels for this face
                 faceOutput[faceIndexer++] = f.size();
diff --git a/src/dynamicMesh/attachDetach/detachInterface.C b/src/dynamicMesh/attachDetach/detachInterface.C
index f00979846a..cd85522b6e 100644
--- a/src/dynamicMesh/attachDetach/detachInterface.C
+++ b/src/dynamicMesh/attachDetach/detachInterface.C
@@ -329,7 +329,7 @@ void Foam::attachDetach::detachInterface
     { // Protection and memory management
         // Make a map of master cells for quick reject
         labelHashSet mcMap(2*mc.size());
-        mcMap.insertMany(mc);
+        mcMap.insert(mc);
 
         // Go through all the faces in the masterCellFaceMap.  If the
         // cells around them are not already used, add all of their
@@ -345,7 +345,7 @@ void Foam::attachDetach::detachInterface
             {
                 // Cell not found. Add its faces to the map
                 const cell& curFaces = cells[ownCell];
-                masterCellFaceMap.insertMany(curFaces);
+                masterCellFaceMap.insert(curFaces);
             }
 
             // Do the neighbour side if face is internal
@@ -357,7 +357,7 @@ void Foam::attachDetach::detachInterface
                 {
                     // Cell not found. Add its faces to the map
                     const cell& curFaces = cells[neiCell];
-                    masterCellFaceMap.insertMany(curFaces);
+                    masterCellFaceMap.insert(curFaces);
                 }
             }
         }
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 4206ca325b..8be1f49898 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -228,7 +228,7 @@ Foam::wordList Foam::fvMeshDistribute::mergeWordList(const wordList& procNames)
     wordHashSet mergedNames;
     forAll(allNames, proci)
     {
-        mergedNames.insertMany(allNames[proci]);
+        mergedNames.insert(allNames[proci]);
     }
     return mergedNames.toc();
 }
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
index bfc9eb1f58..a5be6f412b 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
@@ -99,7 +99,7 @@ Foam::labelHashSet Foam::motionSmootherAlgo::getPoints
 
     for (const label faceId : faceLabels)
     {
-        usedPoints.insertMany(mesh_.faces()[faceId]);
+        usedPoints.insert(mesh_.faces()[faceId]);
     }
 
     return usedPoints;
@@ -115,7 +115,7 @@ Foam::labelHashSet Foam::motionSmootherAlgo::getPoints
 
     for (const label faceId : faceLabels)
     {
-        usedPoints.insertMany(mesh_.faces()[faceId]);
+        usedPoints.insert(mesh_.faces()[faceId]);
     }
 
     return usedPoints;
@@ -328,7 +328,7 @@ void Foam::motionSmootherAlgo::getAffectedFacesAndPoints
             {
                 const cell& cFaces = mesh_.cells()[pCells[pCelli]];
 
-                nbrFaces.insertMany(cFaces);
+                nbrFaces.insert(cFaces);
             }
         }
         nbrFaces.sync(mesh_);
@@ -338,7 +338,7 @@ void Foam::motionSmootherAlgo::getAffectedFacesAndPoints
             for (const label facei : nbrFaces)
             {
                 const face& f = mesh_.faces()[facei];
-                isAffectedPoint.setMany(f);
+                isAffectedPoint.set(f);
             }
         }
     }
@@ -944,14 +944,14 @@ bool Foam::motionSmootherAlgo::scaleMesh
                 const label own = mesh_.faceOwner()[facei];
                 const cell& ownFaces = mesh_.cells()[own];
 
-                newWrongFaces.insertMany(ownFaces);
+                newWrongFaces.insert(ownFaces);
 
                 if (facei < mesh_.nInternalFaces())
                 {
                     const label nei = mesh_.faceNeighbour()[facei];
                     const cell& neiFaces = mesh_.cells()[nei];
 
-                    newWrongFaces.insertMany(neiFaces);
+                    newWrongFaces.insert(neiFaces);
                 }
             }
             wrongFaces.transfer(newWrongFaces);
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index 6d7960e13e..977ac41e0b 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -262,7 +262,7 @@ void Foam::perfectInterface::setRefinement
         {
             const labelList& pFaces = mesh.pointFaces()[meshPointi];
 
-            affectedFaces.insertMany(pFaces);
+            affectedFaces.insert(pFaces);
         }
     }
     forAll(pp1, i)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index e3fce41660..1df70acf07 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -97,7 +97,7 @@ Foam::label Foam::edgeCollapser::checkMeshQuality
     {
         const face& f = mesh.faces()[facei];
 
-        isErrorPoint.setMany(f);
+        isErrorPoint.set(f);
     }
 
     syncTools::syncPointList
@@ -222,7 +222,7 @@ void Foam::edgeCollapser::collapseToEdge
 
     labelList faceEdgesNeg = edgesFromPoints(facei, facePtsNeg);
 
-    collapseEdge.setMany(faceEdgesNeg);
+    collapseEdge.set(faceEdgesNeg);
 
     forAll(facePtsNeg, pI)
     {
@@ -266,7 +266,7 @@ void Foam::edgeCollapser::collapseToEdge
 
     labelList faceEdgesPos = edgesFromPoints(facei, facePtsPos);
 
-    collapseEdge.setMany(faceEdgesPos);
+    collapseEdge.set(faceEdgesPos);
 
     forAll(facePtsPos, pI)
     {
@@ -364,7 +364,7 @@ void Foam::edgeCollapser::collapseToPoint
 
     const labelList& faceEdges = mesh_.faceEdges()[facei];
 
-    collapseEdge.setMany(faceEdges);
+    collapseEdge.set(faceEdges);
 
     forAll(f, pI)
     {
@@ -1511,7 +1511,7 @@ bool Foam::edgeCollapser::setRefinement
             else
             {
                 // Kept face. Mark vertices
-                usedPoint.setMany(f);
+                usedPoint.set(f);
             }
         }
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 79c7e7446a..e58aa2ae8e 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -3764,7 +3764,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
             {
                 const cell& cFaces = mesh_.cells()[celli];
 
-                affectedFace.setMany(cFaces);
+                affectedFace.set(cFaces);
             }
         }
 
@@ -3782,7 +3782,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
             {
                 const labelList& eFaces = mesh_.edgeFaces(edgeI);
 
-                affectedFace.setMany(eFaces);
+                affectedFace.set(eFaces);
             }
         }
     }
@@ -5309,7 +5309,7 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
             {
                 const labelList& pCells = mesh_.pointCells(pointi);
 
-                unrefineCell.setMany(pCells);
+                unrefineCell.set(pCells);
             }
         }
 
@@ -5534,7 +5534,7 @@ void Foam::hexRef8::setUnrefinement
         {
             const labelList& pCells = mesh_.pointCells(splitPointLabels[i]);
 
-            cSet.insertMany(pCells);
+            cSet.insert(pCells);
         }
         cSet.write();
 
@@ -5558,7 +5558,7 @@ void Foam::hexRef8::setUnrefinement
         {
             const labelList& pFaces = mesh_.pointFaces()[splitPointLabels[i]];
 
-            splitFaces.insertMany(pFaces);
+            splitFaces.insert(pFaces);
         }
 
         // Check with faceRemover what faces will get removed. Note that this
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
index 594f2e279e..3e0e48fe3e 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
@@ -343,7 +343,7 @@ void Foam::removePoints::setRefinement
             // Store faces affected
             const labelList& pFaces = mesh_.pointFaces()[pointi];
 
-            facesAffected.insertMany(pFaces);
+            facesAffected.insert(pFaces);
         }
     }
 
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index e3b5043fc3..3e05d3a3a1 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -186,7 +186,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             // edges
             for (const label slaveEdgei : curSlaveEdges)
             {
-                usedMasterEdges[slaveEdgei].insertMany(curMasterEdges);
+                usedMasterEdges[slaveEdgei].insert(curMasterEdges);
             }
         }
         else if (slavePointEdgeHits[pointi] > -1)
@@ -211,7 +211,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         {
             const labelList& curMasterEdges = masterPointEdges[masterPointi];
 
-            usedMasterEdges[masterPointEdgeHits[masterPointi]].insertMany
+            usedMasterEdges[masterPointEdgeHits[masterPointi]].insert
             (
                 curMasterEdges
             );
@@ -571,7 +571,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                 //     << masterPatch.localFaces()[facei]
                 //     << endl;
 
-                curMasterEdgesMap.insertMany(masterFaceEdges[facei]);
+                curMasterEdgesMap.insert(masterFaceEdges[facei]);
             }
 
             const labelList curMasterEdges(curMasterEdgesMap.toc());
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index c1ff91566f..ca6d503b0d 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -880,7 +880,7 @@ bool Foam::slidingInterface::projectPoints() const
             for (const label facei : curFaceMap)
             {
                 const face& f = masterLocalFaces[facei];
-                curPointMap.insertMany(f);  // Insert all face points
+                curPointMap.insert(f);  // Insert all face points
             }
 
             const labelList curMasterPoints = curPointMap.toc();
diff --git a/src/fileFormats/ensight/file/ensightCase.C b/src/fileFormats/ensight/file/ensightCase.C
index dd97fa5705..1193d3a691 100644
--- a/src/fileFormats/ensight/file/ensightCase.C
+++ b/src/fileFormats/ensight/file/ensightCase.C
@@ -109,7 +109,7 @@ Foam::label Foam::ensightCase::checkTimeset(const labelHashSet& lookup) const
         }
 
         // OR
-        // tsTimes.unsetMany(timesUsed_.toc());
+        // tsTimes.unset(timesUsed_.toc());
 
         if (tsTimes.empty())
         {
diff --git a/src/finiteArea/faMesh/faMeshDemandDrivenData.C b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
index 80661cd9a9..82ae59060d 100644
--- a/src/finiteArea/faMesh/faMeshDemandDrivenData.C
+++ b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
@@ -1455,7 +1455,7 @@ void Foam::faMesh::calcPointAreaNormalsByQuadricsFit() const
                     procPatch.neighbPoints()[nonGlobalPatchPoints[pointI]];
 
                 labelHashSet faceSet;
-                faceSet.insertMany(pointFaces[curPoint]);
+                faceSet.insert(pointFaces[curPoint]);
 
                 labelList curFaces = faceSet.toc();
 
diff --git a/src/finiteVolume/functionObjects/fieldSelection/fieldSelectionTemplates.C b/src/finiteVolume/functionObjects/fieldSelection/fieldSelectionTemplates.C
index 653de0edfa..95a692847e 100644
--- a/src/finiteVolume/functionObjects/fieldSelection/fieldSelectionTemplates.C
+++ b/src/finiteVolume/functionObjects/fieldSelection/fieldSelectionTemplates.C
@@ -36,7 +36,7 @@ void Foam::functionObjects::fieldSelection::addRegistered
 {
     for (const wordRe& name : *this)
     {
-        set.insertMany(obr_.names<Type>(name));
+        set.insert(obr_.names<Type>(name));
     }
 }
 
diff --git a/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelectionTemplates.C b/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelectionTemplates.C
index 9ea26d114f..463aeac040 100644
--- a/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelectionTemplates.C
+++ b/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelectionTemplates.C
@@ -38,7 +38,7 @@ void Foam::functionObjects::fileFieldSelection::addFromFile
 {
     for (const wordRe& fieldName : *this)
     {
-        set.insertMany(allFileObjects.names(Type::typeName, fieldName));
+        set.insert(allFileObjects.names(Type::typeName, fieldName));
     }
 }
 
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
index 824b4c84fb..3382092993 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
@@ -336,7 +336,7 @@ void Foam::isoAdvection::timeIntegratedFlux()
                         // 1 - neighbours of neighbours
                         // 2 - ...
                         const labelList& nNeighbourCells = cellCells[otherCell];
-                        checkBounding_.setMany(nNeighbourCells);
+                        checkBounding_.set(nNeighbourCells);
                     }
                     else
                     {
@@ -1040,7 +1040,7 @@ void Foam::isoAdvection::writeSurfaceCells() const
             )
         );
 
-        cSet.insertMany(surfCells_);
+        cSet.insert(surfCells_);
 
         cSet.write();
     }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
index b2ecb94b95..d4b051c845 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
@@ -242,7 +242,7 @@ void Foam::cellToCellStencil::unionEqOp::operator()
         else
         {
             labelHashSet set(x);
-            set.insertMany(y);
+            set.insert(y);
             x = set.toc();
         }
     }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
index 96318c05e9..7106ebfae5 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
@@ -243,7 +243,7 @@ void Foam::cellToFaceStencil::unionEqOp::operator()
         else
         {
             labelHashSet set(x);
-            set.insertMany(y);
+            set.insert(y);
             x = set.toc();
         }
     }
@@ -382,11 +382,11 @@ void Foam::cellToFaceStencil::calcFaceStencil
 
         const labelList& ownCCells = globalCellCells[own[facei]];
         label globalOwn = ownCCells[0];
-        faceStencilSet.insertMany(ownCCells);  // Insert cellCells
+        faceStencilSet.insert(ownCCells);  // Insert cellCells
 
         const labelList& neiCCells = globalCellCells[nei[facei]];
         label globalNei = neiCCells[0];
-        faceStencilSet.insertMany(neiCCells);  // Insert cellCells
+        faceStencilSet.insert(neiCCells);  // Insert cellCells
 
         // Guarantee owner first, neighbour second.
         faceStencil[facei].setSize(faceStencilSet.size());
@@ -416,13 +416,13 @@ void Foam::cellToFaceStencil::calcFaceStencil
 
                 const labelList& ownCCells = globalCellCells[own[facei]];
                 label globalOwn = ownCCells[0];
-                faceStencilSet.insertMany(ownCCells);
+                faceStencilSet.insert(ownCCells);
 
                 // And the neighbours of the coupled cell
                 const labelList& neiCCells =
                     neiGlobalCellCells[facei-mesh_.nInternalFaces()];
                 label globalNei = neiCCells[0];
-                faceStencilSet.insertMany(neiCCells);
+                faceStencilSet.insert(neiCCells);
 
                 // Guarantee owner first, neighbour second.
                 faceStencil[facei].setSize(faceStencilSet.size());
@@ -452,7 +452,7 @@ void Foam::cellToFaceStencil::calcFaceStencil
 
                 const labelList& ownCCells = globalCellCells[own[facei]];
                 label globalOwn = ownCCells[0];
-                faceStencilSet.insertMany(ownCCells);
+                faceStencilSet.insert(ownCCells);
 
                 // Guarantee owner first
                 faceStencil[facei].setSize(faceStencilSet.size());
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
index 054ad322cb..8643160190 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFields.C
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
@@ -146,7 +146,7 @@ bool Foam::functionObjects::turbulenceFields::read(const dictionary& dict)
     }
     else
     {
-        fieldSet_.insertMany(wordList(dict.lookup("fields")));
+        fieldSet_.insert(wordList(dict.lookup("fields")));
     }
 
     Info<< type() << " " << name() << ": ";
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
index 09cbf24c1f..3da906bcdc 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
@@ -92,7 +92,7 @@ Foam::ParticleErosion<CloudType>::ParticleErosion
                 << endl;
         }
 
-        uniqIds.insertMany(ids);
+        uniqIds.insert(ids);
     }
 
     patchIDs_ = uniqIds.sortedToc();
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
index 6e849578d0..21752df47f 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
@@ -149,7 +149,7 @@ Foam::PatchPostProcessing<CloudType>::PatchPostProcessing
                 << endl;
         }
 
-        uniqIds.insertMany(ids);
+        uniqIds.insert(ids);
     }
 
     patchIDs_ = uniqIds.sortedToc();
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 98a2620231..2bf1272938 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -1021,7 +1021,7 @@ Foam::label Foam::meshRefinement::splitFacesUndo
         {
             const labelList grownFaces(growFaceCellFace(errorFaces));
             errorFaces.clear();
-            errorFaces.insertMany(grownFaces);
+            errorFaces.insert(grownFaces);
         }
 
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index 30dd83ee98..9a560ff3dd 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -625,7 +625,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
             {
                 const cell& ownFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
 
-                baffledFacesSet.insertMany(ownFaces);
+                baffledFacesSet.insert(ownFaces);
             }
         }
         // Pick up neighbour side of baffle (added faces)
@@ -637,7 +637,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
             {
                 const cell& ownFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
 
-                baffledFacesSet.insertMany(ownFaces);
+                baffledFacesSet.insert(ownFaces);
             }
         }
         baffledFacesSet.sync(mesh_);
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
index 21f3e1ba34..739bff247f 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
@@ -225,13 +225,13 @@ Foam::label Foam::meshRefinement::mergePatchFaces
 //
 //            const cell& ownFaces = cells[mesh_.faceOwner()[facei]];
 //
-//            retestFaces.insertMany(ownFaces);
+//            retestFaces.insert(ownFaces);
 //
 //            if (mesh_.isInternalFace(facei))
 //            {
 //                const cell& neiFaces = cells[mesh_.faceNeighbour()[facei]];
 //
-//                retestFaces.insertMany(neiFaces);
+//                retestFaces.insert(neiFaces);
 //            }
 //        }
 //        updateMesh(map, retestFaces.toc());
@@ -329,7 +329,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
             faceSet allSets(mesh_, "allFaceSets", allFaceSets.size());
             forAll(allFaceSets, setI)
             {
-                allSets.insertMany(allFaceSets[setI]);
+                allSets.insert(allFaceSets[setI]);
             }
             Pout<< "Writing all faces to be merged to set "
                 << allSets.objectPath() << endl;
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index c4689ee4e9..9894260265 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -616,7 +616,7 @@ void Foam::snappyLayerDriver::handleNonManifolds
         bitSet isCoupledEdge(mesh.nEdges());
 
         const labelList& cpEdges = mesh.globalData().coupledPatchMeshEdges();
-        isCoupledEdge.setMany(cpEdges);
+        isCoupledEdge.set(cpEdges);
 
         syncTools::syncEdgeList
         (
@@ -4663,7 +4663,7 @@ void Foam::snappyLayerDriver::doLayers
 
                     if (numLayers[mpi] > 0 || numLayers[spi])
                     {
-                        isExtrudedZoneFace.setMany(fZone);
+                        isExtrudedZoneFace.set(fZone);
                     }
                 }
             }
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 4a0a76ab9f..c7a165672a 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -150,13 +150,13 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothInternalDisplacement
     //        {
     //            label own = mesh.faceOwner()[facei];
     //            const cell& ownFaces = mesh.cells()[own];
-    //            newIsFront.setMany(ownFaces);
+    //            newIsFront.set(ownFaces);
     //
     //            if (mesh.isInternalFace(facei))
     //            {
     //                label nei = mesh.faceNeighbour()[facei];
     //                const cell& neiFaces = mesh.cells()[nei];
-    //                newIsFront.setMany(neiFaces);
+    //                newIsFront.set(neiFaces);
     //            }
     //        }
     //    }
@@ -186,7 +186,7 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothInternalDisplacement
         if (!isFront[facei] && ownLevel != neiLevel)
         {
             const face& f = mesh.faces()[facei];
-            isMovingPoint.setMany(f);
+            isMovingPoint.set(f);
 
             ++nInterface;
         }
@@ -203,7 +203,7 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothInternalDisplacement
         if (!isFront[facei] && ownLevel != neiLevel)
         {
             const face& f = mesh.faces()[facei];
-            isMovingPoint.setMany(f);
+            isMovingPoint.set(f);
 
             ++nInterface;
         }
@@ -2265,7 +2265,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::snappySnapDriver::repatchToSurface
             const label zoneSurfi = zonedSurfaces[i];
             const faceZone& fZone = fZones[surfZones[zoneSurfi].faceZoneName()];
 
-            isZonedFace.setMany(fZone);
+            isZonedFace.set(fZone);
         }
     }
 
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index cac1a24499..54feab18b6 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -300,7 +300,7 @@ void Foam::cellClassification::markCells
 
             // Mark faces of celli
             const labelList& myFaces = mesh_.cells()[celli];
-            outsideFacesMap.insertMany(myFaces);
+            outsideFacesMap.insert(myFaces);
         }
     }
 
diff --git a/src/meshTools/cellDist/cellDistFuncs.C b/src/meshTools/cellDist/cellDistFuncs.C
index add2a76885..5ab03bd473 100644
--- a/src/meshTools/cellDist/cellDistFuncs.C
+++ b/src/meshTools/cellDist/cellDistFuncs.C
@@ -172,7 +172,7 @@ Foam::label Foam::cellDistFuncs::getPointNeighbours
         forAll(f, fp)
         {
             const labelList& pointNbs = patch.pointFaces()[f[fp]];
-            nbs.insertMany(pointNbs);
+            nbs.insert(pointNbs);
         }
 
         // Subtract ours.
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index f1e4964867..0baeaef92a 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -1531,14 +1531,14 @@ void Foam::extendedEdgeMesh::autoMap
             label pointI = pointMap[subPointI];
             const labelList& pNormals = featurePointNormals()[pointI];
 
-            isSubNormal.setMany(pNormals);
+            isSubNormal.set(pNormals);
         }
         forAll(edgeMap, subEdgeI)
         {
             label edgeI = edgeMap[subEdgeI];
             const labelList& eNormals = edgeNormals()[edgeI];
 
-            isSubNormal.setMany(eNormals);
+            isSubNormal.set(eNormals);
         }
 
         forAll(isSubNormal, normalI)
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index 41b709f073..2548717c69 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -47,7 +47,7 @@ Foam::treeBoundBox Foam::treeDataFace::calcBb(const label facei) const
 
 void Foam::treeDataFace::update()
 {
-    isTreeFace_.setMany(faceLabels_);
+    isTreeFace_.set(faceLabels_);
 
     if (cacheBb_)
     {
diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C
index 4caac13451..07fc46bec4 100644
--- a/src/meshTools/meshTools/meshTools.C
+++ b/src/meshTools/meshTools/meshTools.C
@@ -301,7 +301,7 @@ void Foam::meshTools::writeOBJ
     forAll(cellLabels, i)
     {
         const cell& cFaces = cells[cellLabels[i]];
-        usedFaces.insertMany(cFaces);
+        usedFaces.insert(cFaces);
     }
 
     writeOBJ(os, faces, points, usedFaces.toc());
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
index 576aeae449..7430c4fe2b 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
@@ -33,13 +33,9 @@ License
 
 namespace Foam
 {
-
 defineTypeNameAndDebug(normalToFace, 0);
-
 addToRunTimeSelectionTable(topoSetSource, normalToFace, word);
-
 addToRunTimeSelectionTable(topoSetSource, normalToFace, istream);
-
 }
 
 
@@ -160,7 +156,7 @@ void Foam::normalToFace::applyToSet
             }
         }
 
-        set.eraseMany(toBeRemoved);
+        set.erase(toBeRemoved);
     }
 }
 
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index 1aaf5824f7..aa5b7098d6 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -384,7 +384,7 @@ Foam::labelHashSet Foam::triSurfaceTools::getCollapsedFaces
     const labelList& myFaces = surf.edgeFaces()[edgeI];
 
     labelHashSet facesToBeCollapsed(2*myFaces.size());
-    facesToBeCollapsed.insertMany(myFaces);
+    facesToBeCollapsed.insert(myFaces);
 
     // From faces using v1 check if they share an edge with faces
     // using v2.
diff --git a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
index c2eb746802..8ffc7f6c6e 100644
--- a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
+++ b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
@@ -162,7 +162,7 @@ void Foam::cellCellStencils::cellVolumeWeight::walkFront
                                 << " to " << fraction << endl;
                         }
                         allCellTypes[own] = INTERPOLATED;
-                        newIsFront.setMany(mesh_.cells()[own]);
+                        newIsFront.set(mesh_.cells()[own]);
                     }
                 }
                 if (mesh_.isInternalFace(faceI))
@@ -182,7 +182,7 @@ void Foam::cellCellStencils::cellVolumeWeight::walkFront
                             }
 
                             allCellTypes[nei] = INTERPOLATED;
-                            newIsFront.setMany(mesh_.cells()[nei]);
+                            newIsFront.set(mesh_.cells()[nei]);
                         }
                     }
                 }
diff --git a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
index c7e1a89342..c1aff86878 100644
--- a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
@@ -85,7 +85,7 @@ Foam::labelList Foam::structuredDecomp::decompose
     labelHashSet patchCells(2*nFaces);
     for (const label patchi : patchIDs)
     {
-        patchCells.insertMany(pbm[patchi].faceCells());
+        patchCells.insert(pbm[patchi].faceCells());
     }
 
     // Subset the layer of cells next to the patch
diff --git a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C
index 8c2ffc0014..030ba6dffc 100644
--- a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C
+++ b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C
@@ -160,7 +160,7 @@ Foam::labelList Foam::structuredRenumber::renumber
     labelHashSet patchCells(2*nFaces);
     for (const label patchId : patchIDs)
     {
-        patchCells.insertMany(pbm[patchId].faceCells());
+        patchCells.insert(pbm[patchId].faceCells());
     }
 
     label nTotalSeeds = returnReduce(patchCells.size(), sumOp<label>());
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index 427d038b9b..a41839cade 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -177,17 +177,17 @@ Foam::label Foam::probes::prepare()
     {
         wordHashSet currentFields;
 
-        currentFields.insertMany(scalarFields_);
-        currentFields.insertMany(vectorFields_);
-        currentFields.insertMany(sphericalTensorFields_);
-        currentFields.insertMany(symmTensorFields_);
-        currentFields.insertMany(tensorFields_);
+        currentFields.insert(scalarFields_);
+        currentFields.insert(vectorFields_);
+        currentFields.insert(sphericalTensorFields_);
+        currentFields.insert(symmTensorFields_);
+        currentFields.insert(tensorFields_);
 
-        currentFields.insertMany(surfaceScalarFields_);
-        currentFields.insertMany(surfaceVectorFields_);
-        currentFields.insertMany(surfaceSphericalTensorFields_);
-        currentFields.insertMany(surfaceSymmTensorFields_);
-        currentFields.insertMany(surfaceTensorFields_);
+        currentFields.insert(surfaceScalarFields_);
+        currentFields.insert(surfaceVectorFields_);
+        currentFields.insert(surfaceSphericalTensorFields_);
+        currentFields.insert(surfaceSymmTensorFields_);
+        currentFields.insert(surfaceTensorFields_);
 
         DebugInfo
             << "Probing fields: " << currentFields << nl
diff --git a/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C b/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C
index 7f269240af..44ca76df3c 100644
--- a/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C
+++ b/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C
@@ -243,11 +243,11 @@ bool Foam::surfMeshSamplers::execute()
 
     // The acceptable fields
     wordHashSet acceptable(added);
-    acceptable.insertMany(acceptType<scalar>());
-    acceptable.insertMany(acceptType<vector>());
-    acceptable.insertMany(acceptType<sphericalTensor>());
-    acceptable.insertMany(acceptType<symmTensor>());
-    acceptable.insertMany(acceptType<tensor>());
+    acceptable.insert(acceptType<scalar>());
+    acceptable.insert(acceptType<vector>());
+    acceptable.insert(acceptType<sphericalTensor>());
+    acceptable.insert(acceptType<symmTensor>());
+    acceptable.insert(acceptType<tensor>());
 
     const wordList fields = acceptable.sortedToc();
     if (!fields.empty())
diff --git a/src/sampling/surface/isoSurface/isoSurface.C b/src/sampling/surface/isoSurface/isoSurface.C
index 1a2f36b07e..d3faf431f2 100644
--- a/src/sampling/surface/isoSurface/isoSurface.C
+++ b/src/sampling/surface/isoSurface/isoSurface.C
@@ -1572,7 +1572,7 @@ Foam::isoSurface::isoSurface
                     {
                         const face& f = mesh_.faces()[cpp.start()+i];
 
-                        isBoundaryPoint.setMany(f);
+                        isBoundaryPoint.set(f);
                     }
                 }
             }
@@ -1584,7 +1584,7 @@ Foam::isoSurface::isoSurface
                 {
                     const face& f = mesh_.faces()[pp.start()+i];
 
-                    isBoundaryPoint.setMany(f);
+                    isBoundaryPoint.set(f);
                 }
             }
         }
diff --git a/src/sampling/surface/isoSurface/isoSurfaceCell.C b/src/sampling/surface/isoSurface/isoSurfaceCell.C
index b110d1552c..05d2eb00f2 100644
--- a/src/sampling/surface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/surface/isoSurface/isoSurfaceCell.C
@@ -695,7 +695,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
             {
                 const face& f = mesh_.faces()[facei++];
 
-                isBoundaryPoint.setMany(f);
+                isBoundaryPoint.set(f);
             }
         }
     }
diff --git a/src/surfMesh/triSurface/triSurfaceIO.C b/src/surfMesh/triSurface/triSurfaceIO.C
index 7d3154f416..3c38733d21 100644
--- a/src/surfMesh/triSurface/triSurfaceIO.C
+++ b/src/surfMesh/triSurface/triSurfaceIO.C
@@ -339,7 +339,7 @@ void Foam::triSurface::writeStats(Ostream& os) const
         forAll(f, fp)
         {
             const label pointi = f[fp];
-            if (pointIsUsed.set(pointi, 1))
+            if (pointIsUsed.set(pointi))
             {
                 bb.add(points()[pointi]);
                 ++nPoints;
diff --git a/src/surfMesh/triSurface/triSurfaceStitch.C b/src/surfMesh/triSurface/triSurfaceStitch.C
index 47e47f28b2..0cdbcd3e9a 100644
--- a/src/surfMesh/triSurface/triSurfaceStitch.C
+++ b/src/surfMesh/triSurface/triSurfaceStitch.C
@@ -109,7 +109,7 @@ bool Foam::triSurface::stitchTriangles
             {
                 for (const label pointi : f)
                 {
-                    if (pointIsUsed.set(pointi, 1))
+                    if (pointIsUsed.set(pointi))
                     {
                         ++nPoints;
                     }

From f9fe71815a328ed7e9cc75c7dcd5b2d4db6d1324 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 30 May 2018 12:03:17 +0200
Subject: [PATCH 07/13] STYLE: consistent use of '= delete' for removed
 constructors/assignments

- make the purpose more explicit, and reduces some work for the
  compiler as well.
---
 .../basicXiSubXiEq/basicXiSubXiEq.H           |  8 ++--
 .../XiGModels/basicXiSubG/basicXiSubG.H       |  8 ++--
 .../dragModels/PDRDragModel/PDRDragModel.H    |  8 ++--
 .../PDRModels/dragModels/basic/basic.H        |  8 ++--
 .../XiModels/XiEqModels/Gulder/Gulder.H       |  8 ++--
 .../SCOPEBlendXiEq/SCOPEBlendXiEq.H           |  8 ++--
 .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H |  8 ++--
 .../XiModels/XiEqModels/XiEqModel/XiEqModel.H |  8 ++--
 .../instabilityXiEq/instabilityXiEq.H         |  8 ++--
 .../PDRFoam/XiModels/XiGModels/KTS/KTS.H      |  8 ++--
 .../XiModels/XiGModels/XiGModel/XiGModel.H    |  8 ++--
 .../XiGModels/instabilityG/instabilityG.H     |  8 ++--
 .../PDRFoam/XiModels/XiModel/XiModel.H        |  8 ++--
 .../PDRFoam/XiModels/algebraic/algebraic.H    |  8 ++--
 .../combustion/PDRFoam/XiModels/fixed/fixed.H |  8 ++--
 .../PDRFoam/XiModels/transport/transport.H    |  8 ++--
 .../VoFPatchTransfer/VoFPatchTransfer.H       |  8 ++--
 .../VoFSolidificationMeltingSource.H          | 11 ++++--
 .../mixtureViscosityModel.H                   |  8 ++--
 .../relativeVelocityModel.H                   |  8 ++--
 .../temperaturePhaseChangeTwoPhaseMixture.H   |  8 ++--
 .../threePhaseInterfaceProperties.H           | 12 ++++--
 .../phaseChangeTwoPhaseMixture.H              |  8 ++--
 .../saturationModel/saturationModel.H         |  8 ++--
 .../wallDependentModel/wallDependentModel.H   |  8 ++--
 .../BlendedInterfacialModel.H                 | 11 ++++--
 .../departureDiameterModel.H                  |  8 ++--
 .../departureFrequencyModel.H                 |  8 ++--
 .../nucleationSiteModel/nucleationSiteModel.H |  8 ++--
 .../partitioningModel/partitioningModel.H     |  8 ++--
 .../conductivityModel/conductivityModel.H     |  8 ++--
 .../frictionalStressModel.H                   |  8 ++--
 .../granularPressureModel.H                   |  8 ++--
 .../kineticTheoryModel/kineticTheoryModel.H   |  8 ++--
 .../radialModel/radialModel/radialModel.H     |  8 ++--
 .../viscosityModel/viscosityModel.H           |  8 ++--
 .../phasePressureModel/phasePressureModel.H   |  8 ++--
 .../wallDependentModel/wallDependentModel.H   |  8 ++--
 .../conductivityModel/conductivityModel.H     |  8 ++--
 .../frictionalStressModel.H                   |  8 ++--
 .../granularPressureModel.H                   |  8 ++--
 .../kineticTheoryModel/kineticTheoryModel.H   |  8 ++--
 .../radialModel/radialModel/radialModel.H     |  8 ++--
 .../viscosityModel/viscosityModel.H           |  8 ++--
 .../phasePressureModel/phasePressureModel.H   |  8 ++--
 .../BlendedInterfacialModel.H                 | 11 ++++--
 .../test/dictionaryTokens/dictionaryTokens.H  | 12 ++++--
 applications/test/router/router.H             |  8 ++--
 .../mesh/advanced/modifyMesh/cellSplitter.H   |  8 ++--
 .../mesh/advanced/selectCells/edgeStats.H     |  8 ++--
 .../mesh/conversion/cfx4ToFoam/hexBlock.H     |  8 ++--
 .../mesh/conversion/plot3dToFoam/hexBlock.H   |  8 ++--
 .../extrudeMesh/extrudedMesh/extrudedMesh.H   |  4 +-
 .../extrude2DMesh/extrude2DMesh.H             |  8 ++--
 .../patchToPoly2DMesh/patchToPoly2DMesh.H     |  8 ++--
 .../cv2DControls/cv2DControls.H               |  8 ++--
 .../DelaunayMesh/DelaunayMesh.H               |  8 ++--
 .../DelaunayMesh/DistributedDelaunayMesh.H    | 11 ++++--
 .../PrintTable/PrintTable.C                   | 18 ---------
 .../PrintTable/PrintTable.H                   |  6 +--
 .../PrintTable/PrintTableI.H                  |  6 +--
 .../backgroundMeshDecomposition.H             | 11 ++++--
 .../cellAspectRatioControl.H                  |  8 ++--
 .../cellShapeControl/cellShapeControl.H       |  8 ++--
 .../cellShapeControlMesh.H                    |  8 ++--
 .../cellSizeAndAlignmentControl.H             | 11 ++++--
 .../cellSizeAndAlignmentControls.H            | 11 ++++--
 .../fileControl/fileControl.H                 |  8 ++--
 .../searchableSurfaceControl.H                |  8 ++--
 .../controlMeshRefinement.H                   |  8 ++--
 .../smoothAlignmentSolver.H                   |  8 ++--
 .../cellSizeFunction/cellSizeFunction.H       |  8 ++--
 .../cellSizeCalculationType.H                 |  8 ++--
 .../surfaceCellSizeFunction.H                 |  8 ++--
 .../conformalVoronoiMesh.H                    |  8 ++--
 .../featurePointConformer.H                   |  8 ++--
 .../conformationSurfaces.H                    |  8 ++--
 .../cvControls/cvControls.H                   |  8 ++--
 .../faceAreaWeightModel/faceAreaWeightModel.H |  8 ++--
 .../initialPointsMethod/initialPointsMethod.H |  8 ++--
 .../relaxationModel/relaxationModel.H         |  8 ++--
 .../searchableBoxFeatures.H                   |  8 ++--
 .../searchablePlateFeatures.H                 |  8 ++--
 .../searchableSurfaceFeatures.H               |  8 ++--
 .../triSurfaceMeshFeatures.H                  |  8 ++--
 .../generation/foamyMesh/foamyQuadMesh/CV2D.H |  8 ++--
 .../foamyQuadMesh/shortEdgeFilter2D.H         |  8 ++--
 .../manipulation/mergeMeshes/mergePolyMesh.H  |  4 +-
 .../manipulation/mirrorMesh/mirrorFvMesh.H    |  4 +-
 .../manipulation/polyDualMesh/meshDualiser.H  |  8 ++--
 .../decomposePar/dimFieldDecomposer.H         |  8 ++--
 .../decomposePar/faFieldDecomposer.H          |  8 ++--
 .../decomposePar/lagrangianFieldDecomposer.H  |  8 ++--
 .../decomposePar/pointFieldDecomposer.H       |  8 ++--
 .../reconstructPar/faFieldReconstructor.H     |  8 ++--
 .../reconstructPar/processorFaMeshes.H        |  8 ++--
 .../redistributePar/parFvFieldReconstructor.H |  8 ++--
 .../parLagrangianRedistributor.H              |  8 ++--
 .../passivePositionParticleCloud.H            | 11 ++++--
 .../foamToVTK/foamVtkLagrangianWriter.H       |  4 +-
 .../PVFoamReader/pqFoamReaderControls.h       |  4 +-
 .../PVReaders/PVFoamReader/vtkPVFoamReader.h  |  4 +-
 .../pqFoamBlockMeshControls.h                 |  4 +-
 .../PVblockMeshReader/vtkPVblockMeshReader.h  |  4 +-
 .../PVReaders/vtkPVblockMesh/vtkPVblockMesh.H |  4 +-
 .../miscellaneous/postChannel/channelIndex.H  |  8 ++--
 .../PolyhedronReader/PolyhedronReader.H       |  8 ++--
 src/ODE/ODESolvers/ODESolver/ODESolver.H      |  8 ++--
 src/OSspecific/POSIX/cpuInfo/cpuInfo.H        |  8 ++--
 src/OSspecific/POSIX/endian.H                 |  4 +-
 src/OSspecific/POSIX/fileMonitor.H            |  8 ++--
 src/OpenFOAM/algorithms/subCycle/subCycle.H   |  4 +-
 .../linkTypes/DLListBase/DLListBase.H         |  4 +-
 .../linkTypes/SLListBase/SLListBase.H         |  4 +-
 .../containers/Lists/Histogram/Histogram.H    |  8 ++--
 .../Lists/IndirectList/IndirectList.H         |  8 ++--
 src/OpenFOAM/containers/Lists/List/List.H     | 13 ++++---
 src/OpenFOAM/containers/Lists/UList/UList.H   |  2 +-
 src/OpenFOAM/db/Callback/Callback.H           |  4 +-
 .../db/CallbackRegistry/CallbackRegistry.H    |  8 ++--
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  8 ++--
 .../db/IOstreams/hashes/base64Layer.H         |  4 +-
 src/OpenFOAM/db/IOstreams/token/token.H       |  4 +-
 src/OpenFOAM/db/Time/subLoopTime.H            |  4 +-
 .../dictionaryEntry/dictionaryEntry.H         |  2 +-
 .../dictionaryListEntry/dictionaryListEntry.H |  2 +-
 .../functionEntries/codeStream/codeStream.H   |  4 +-
 .../functionEntry/functionEntry.H             |  4 +-
 .../db/dynamicLibrary/codedBase/codedBase.H   |  4 +-
 .../dlLibraryTable/dlLibraryTable.H           |  8 ++--
 .../functionObject/functionObject.H           |  4 +-
 .../functionObjectList/functionObjectList.H   |  4 +-
 .../db/functionObjects/logFiles/logFiles.H    |  8 ++--
 .../regionFunctionObject.H                    |  4 +-
 .../stateFunctionObject/stateFunctionObject.H |  4 +-
 .../functionObjects/timeControl/timeControl.H |  8 ++--
 .../timeControl/timeControlFunctionObject.H   |  8 ++--
 .../db/functionObjects/writeFile/writeFile.H  |  8 ++--
 .../db/objectRegistry/objectRegistry.H        |  4 +-
 src/OpenFOAM/db/regIOobject/regIOobject.H     |  4 +-
 .../SlicedGeometricField.H                    | 21 ++++++----
 src/OpenFOAM/fields/cloud/cloud.H             |  4 +-
 .../pointPatchFieldMapperPatchRef.H           | 11 ++++--
 src/OpenFOAM/global/profiling/profiling.H     |  4 +-
 .../interpolationWeights.H                    |  8 ++--
 .../PatchToPatchInterpolation.H               |  8 ++--
 .../PrimitivePatchInterpolation.H             | 11 ++++--
 .../uniformInterpolationTable.H               |  4 +-
 .../LUscalarMatrix/procLduInterface.H         |  4 +-
 .../matrices/LUscalarMatrix/procLduMatrix.H   |  4 +-
 .../LduInterfaceField/LduInterfaceField.H     |  8 ++--
 .../DiagonalPreconditioner.H                  |  8 ++--
 .../NoPreconditioner/NoPreconditioner.H       |  8 ++--
 .../Solvers/DiagonalSolver/DiagonalSolver.H   |  8 ++--
 .../LduMatrix/Solvers/PBiCCCG/PBiCCCG.H       |  8 ++--
 .../LduMatrix/Solvers/PBiCICG/PBiCICG.H       |  8 ++--
 .../matrices/LduMatrix/Solvers/PCICG/PCICG.H  |  8 ++--
 .../lduMatrix/lduAddressing/lduAddressing.H   |  8 ++--
 .../lduAddressing/lduInterface/lduInterface.H |  8 ++--
 .../lduInterfaceField/lduInterfaceField.H     |  8 ++--
 .../FDICPreconditioner/FDICPreconditioner.H   |  8 ++--
 .../diagonalPreconditioner.H                  |  8 ++--
 .../noPreconditioner/noPreconditioner.H       |  8 ++--
 .../GAMGAgglomeration/GAMGAgglomeration.H     |  8 ++--
 .../dummyAgglomeration/dummyAgglomeration.H   |  8 ++--
 .../pairGAMGAgglomeration.H                   |  8 ++--
 .../GAMGProcAgglomeration.H                   |  8 ++--
 .../eagerGAMGProcAgglomeration.H              |  8 ++--
 .../manualGAMGProcAgglomeration.H             |  8 ++--
 .../masterCoarsestGAMGProcAgglomeration.H     |  8 ++--
 .../noneGAMGProcAgglomeration.H               |  8 ++--
 .../procFacesGAMGProcAgglomeration.H          |  8 ++--
 .../GAMGInterfaceField/GAMGInterfaceField.H   |  8 ++--
 .../cyclicGAMGInterfaceField.H                |  8 ++--
 .../processorCyclicGAMGInterfaceField.H       |  8 ++--
 .../processorGAMGInterfaceField.H             | 11 ++++--
 .../interfaces/GAMGInterface/GAMGInterface.H  |  8 ++--
 .../cyclicGAMGInterface/cyclicGAMGInterface.H |  8 ++--
 .../processorCyclicGAMGInterface.H            | 11 ++++--
 .../processorGAMGInterface.H                  |  8 ++--
 .../matrices/lduMatrix/solvers/PBiCG/PBiCG.H  |  8 ++--
 .../lduMatrix/solvers/PBiCGStab/PBiCGStab.H   |  8 ++--
 .../matrices/lduMatrix/solvers/PCG/PCG.H      |  8 ++--
 .../solvers/diagonalSolver/diagonalSolver.H   |  8 ++--
 .../matrices/scalarMatrices/SVD/SVD.H         |  8 ++--
 src/OpenFOAM/matrices/solution/solution.H     |  8 ++--
 src/OpenFOAM/matrices/tolerances/tolerances.H |  8 ++--
 src/OpenFOAM/memory/autoPtr/autoPtr.H         |  2 +-
 src/OpenFOAM/memory/tmp/tmp.H                 |  2 +-
 src/OpenFOAM/meshes/data/data.H               |  4 +-
 .../meshes/lduMesh/lduPrimitiveMesh.H         |  8 ++--
 .../meshShapes/cellMatcher/cellMatcher.H      |  4 +-
 .../meshShapes/cellMatcher/hexMatcher.H       |  4 +-
 .../meshShapes/cellMatcher/prismMatcher.H     |  4 +-
 .../meshShapes/cellMatcher/pyrMatcher.H       |  4 +-
 .../meshShapes/cellMatcher/tetMatcher.H       |  4 +-
 .../meshShapes/cellMatcher/tetWedgeMatcher.H  |  4 +-
 .../meshShapes/cellMatcher/wedgeMatcher.H     |  4 +-
 .../pointBoundaryMesh/pointBoundaryMesh.H     |  8 ++--
 .../pointMeshMapper/pointBoundaryMeshMapper.H |  8 ++--
 .../pointMesh/pointMeshMapper/pointMapper.H   |  8 ++--
 .../pointMeshMapper/pointMeshMapper.H         |  8 ++--
 .../pointMeshMapper/pointPatchMapper.H        | 11 ++----
 .../basic/coupled/coupledPointPatch.H         |  8 ++--
 .../constraint/cyclic/cyclicPointPatch.H      |  8 ++--
 .../processor/processorPointPatch.H           |  8 ++--
 .../processorCyclicPointPatch.H               |  8 ++--
 .../derived/coupled/coupledFacePointPatch.H   |  8 ++--
 .../facePointPatch/facePointPatch.H           |  8 ++--
 .../pointPatches/pointPatch/pointPatch.H      |  8 ++--
 .../polyMesh/globalMeshData/globalMeshData.H  |  8 ++--
 .../polyMesh/globalMeshData/globalPoints.H    |  8 ++--
 .../mapPolyMesh/cellMapper/cellMapper.H       |  8 ++--
 .../mapPolyMesh/faceMapper/faceMapper.H       |  8 ++--
 .../mapDistribute/mapDistributePolyMesh.H     |  2 +-
 .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.H |  8 ++--
 .../polyBoundaryMesh/polyBoundaryMesh.H       |  4 +-
 src/OpenFOAM/meshes/polyMesh/polyMesh.H       |  4 +-
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H |  4 +-
 .../meshes/polyMesh/zones/cellZone/cellZone.H |  2 +-
 .../meshes/polyMesh/zones/faceZone/faceZone.H |  4 +-
 .../polyMesh/zones/pointZone/pointZone.H      |  2 +-
 .../meshes/polyMesh/zones/zone/zone.H         |  2 +-
 .../meshes/primitiveMesh/primitiveMesh.H      |  8 ++--
 .../primitiveMesh/primitivePatch/walkPatch.H  |  8 ++--
 src/OpenFOAM/primitives/enums/Enum.H          |  4 +-
 src/OpenFOAM/primitives/enums/NamedEnum.H     |  4 +-
 .../primitives/functions/Function1/CSV/CSV.H  |  2 +-
 .../functions/Function1/Constant/Constant.H   |  2 +-
 .../functions/Function1/One/OneConstant.H     |  2 +-
 .../PolynomialEntry/PolynomialEntry.H         |  2 +-
 .../functions/Function1/Scale/Scale.H         |  2 +-
 .../functions/Function1/Sine/Sine.H           |  2 +-
 .../functions/Function1/Square/Square.H       |  2 +-
 .../functions/Function1/Table/Table.H         |  2 +-
 .../functions/Function1/Table/TableBase.H     |  2 +-
 .../functions/Function1/TableFile/TableFile.H |  2 +-
 .../functions/Function1/Uniform/Uniform.H     |  4 +-
 .../functions/Function1/Zero/ZeroConstant.H   |  2 +-
 .../Function1/halfCosineRamp/halfCosineRamp.H |  2 +-
 .../Function1/linearRamp/linearRamp.H         |  2 +-
 .../Function1/quadraticRamp/quadraticRamp.H   |  2 +-
 .../quarterCosineRamp/quarterCosineRamp.H     |  2 +-
 .../quarterSineRamp/quarterSineRamp.H         |  2 +-
 .../functions/Function1/ramp/ramp.H           |  2 +-
 .../functions/Polynomial/polynomialFunction.H |  4 +-
 .../globalIndexAndTransform.H                 |  8 ++--
 .../primitives/nullObject/nullObject.H        |  4 +-
 .../primitives/strings/lists/CStringList.H    |  4 +-
 .../primitives/subModelBase/subModelBase.H    |  4 +-
 .../RAS/buoyantKEpsilon/buoyantKEpsilon.H     |  8 ++--
 .../compressibleTurbulenceModel.H             | 11 ++++--
 .../incompressibleTurbulenceModel.H           | 11 ++++--
 .../RAS/LamBremhorstKE/LamBremhorstKE.H       |  8 ++--
 .../phaseCompressible/LES/Niceno/NicenoKEqn.H |  8 ++--
 .../LES/SmagorinskyZhang/SmagorinskyZhang.H   |  8 ++--
 .../LES/continuousGasKEqn/continuousGasKEqn.H |  8 ++--
 .../RAS/LaheyKEpsilon/LaheyKEpsilon.H         |  8 ++--
 .../continuousGasKEpsilon.H                   |  8 ++--
 .../RAS/kOmegaSSTSato/kOmegaSSTSato.H         |  8 ++--
 .../RAS/mixtureKEpsilon/mixtureKEpsilon.H     |  8 ++--
 .../schemes/DEShybrid/DEShybrid.H             |  8 ++--
 .../Base/kOmegaSST/kOmegaSSTBase.H            |  8 ++--
 .../turbulenceModels/DES/DESModel/DESModel.H  |  8 ++--
 .../SpalartAllmarasDDES/SpalartAllmarasDDES.H |  8 ++--
 .../SpalartAllmarasDES/SpalartAllmarasDES.H   |  8 ++--
 .../SpalartAllmarasIDDES.H                    |  8 ++--
 .../DES/kOmegaSSTDDES/kOmegaSSTDDES.H         |  8 ++--
 .../DES/kOmegaSSTDES/kOmegaSSTDES.H           |  8 ++--
 .../DES/kOmegaSSTIDDES/kOmegaSSTIDDES.H       |  8 ++--
 .../DeardorffDiffStress/DeardorffDiffStress.H |  8 ++--
 .../turbulenceModels/LES/LESModel/LESModel.H  |  8 ++--
 .../LES/LESdeltas/IDDESDelta/IDDESDelta.H     |  8 ++--
 .../LES/LESdeltas/LESdelta/LESdelta.H         | 10 ++---
 .../LES/LESdeltas/PrandtlDelta/PrandtlDelta.H |  8 ++--
 .../cubeRootVolDelta/cubeRootVolDelta.H       | 12 +++---
 .../LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H   | 11 +++---
 .../maxDeltaxyzCubeRootLESDelta.H             | 14 ++++---
 .../LES/LESdeltas/smoothDelta/smoothDelta.H   |  8 ++--
 .../LESdeltas/vanDriestDelta/vanDriestDelta.H |  8 ++--
 .../LES/LESeddyViscosity/LESeddyViscosity.H   |  8 ++--
 .../LES/LESfilters/LESfilter/LESfilter.H      |  8 ++--
 .../anisotropicFilter/anisotropicFilter.H     |  8 ++--
 .../LESfilters/laplaceFilter/laplaceFilter.H  | 11 +++---
 .../LESfilters/simpleFilter/simpleFilter.H    | 11 +++---
 .../LES/Smagorinsky/Smagorinsky.H             |  8 ++--
 .../turbulenceModels/LES/WALE/WALE.H          |  8 ++--
 .../LES/dynamicKEqn/dynamicKEqn.H             |  8 ++--
 .../LES/dynamicLagrangian/dynamicLagrangian.H |  8 ++--
 .../turbulenceModels/LES/kEqn/kEqn.H          | 14 +++----
 .../turbulenceModels/RAS/LRR/LRR.H            |  8 ++--
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.H     |  8 ++--
 .../turbulenceModels/RAS/RASModel/RASModel.H  |  8 ++--
 .../RAS/RNGkEpsilon/RNGkEpsilon.H             |  8 ++--
 .../turbulenceModels/RAS/SSG/SSG.H            |  8 ++--
 .../RAS/SpalartAllmaras/SpalartAllmaras.H     |  8 ++--
 .../turbulenceModels/RAS/kEpsilon/kEpsilon.H  |  8 ++--
 .../RAS/kOmegaSST/kOmegaSST.H                 |  8 ++--
 .../RAS/kOmegaSSTLM/kOmegaSSTLM.H             |  8 ++--
 .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.H           |  8 ++--
 .../TurbulenceModel/TurbulenceModel.H         |  8 ++--
 .../laminar/laminarModel/laminarModel.H       |  8 ++--
 .../turbulenceModels/turbulenceModel.H        |  8 ++--
 src/combustionModels/EDC/EDC.H                |  8 ++--
 src/combustionModels/FSD/FSD.H                |  8 ++--
 .../consumptionSpeed/consumptionSpeed.H       |  8 ++--
 .../reactionRateFlameArea.H                   |  8 ++--
 .../relaxation/relaxation.H                   |  8 ++--
 src/combustionModels/PaSR/PaSR.H              |  8 ++--
 .../combustionModel/combustionModel.H         |  8 ++--
 src/combustionModels/diffusion/diffusion.H    |  8 ++--
 .../diffusionMulticomponent.H                 |  8 ++--
 .../eddyDissipationDiffusionModel.H           | 11 ++++--
 .../eddyDissipationModelBase.H                |  8 ++--
 .../infinitelyFastChemistry.H                 |  8 ++--
 src/combustionModels/laminar/laminar.H        |  8 ++--
 .../noCombustion/noCombustion.H               |  8 ++--
 .../psiChemistryCombustion.H                  |  4 +-
 .../psiCombustionModel/psiCombustionModel.H   |  4 +-
 .../psiThermoCombustion/psiThermoCombustion.H |  4 +-
 .../rhoChemistryCombustion.H                  |  4 +-
 .../rhoCombustionModel/rhoCombustionModel.H   |  4 +-
 .../rhoThermoCombustion/rhoThermoCombustion.H |  4 +-
 .../singleStepCombustion.H                    |  8 ++--
 .../zoneCombustion/zoneCombustion.H           |  8 ++--
 src/conversion/ccm/common/ccmBase.H           |  4 +-
 src/conversion/ccm/reader/ccmReader.H         |  4 +-
 src/conversion/ccm/writer/ccmWriter.H         |  4 +-
 src/conversion/common/reader/meshReader.H     |  4 +-
 src/conversion/common/tables/boundaryRegion.H |  2 +-
 src/conversion/common/tables/cellTable.H      |  2 +-
 src/conversion/common/writer/meshWriter.H     |  4 +-
 src/conversion/ensight/mesh/ensightMesh.H     |  4 +-
 src/conversion/ensight/output/ensightOutput.H |  5 +--
 .../ensight/output/ensightSerialOutput.H      |  4 +-
 src/conversion/ensight/part/ensightPart.H     |  4 +-
 .../ensight/part/ensightPartCells.H           |  4 +-
 .../ensight/part/ensightPartFaces.H           |  4 +-
 src/conversion/ensight/part/ensightParts.H    |  4 +-
 src/conversion/fire/FIREMeshWriter.H          |  4 +-
 src/conversion/polyDualMesh/polyDualMesh.H    |  8 ++--
 src/conversion/starcd/STARCDMeshReader.H      |  4 +-
 src/conversion/starcd/STARCDMeshWriter.H      |  4 +-
 .../vtk/output/foamVtkInternalWriter.H        |  4 +-
 .../vtk/output/foamVtkPatchWriter.H           |  4 +-
 .../vtk/output/foamVtkSurfaceMeshWriter.H     |  4 +-
 src/conversion/vtk/part/foamVtuCells.H        |  4 +-
 .../dynamicFvMesh/dynamicFvMesh.H             |  4 +-
 .../dynamicInkJetFvMesh/dynamicInkJetFvMesh.H |  8 ++--
 .../dynamicMotionSolverFvMesh.H               |  8 ++--
 .../dynamicMotionSolverListFvMesh.H           | 11 ++++--
 .../dynamicMultiMotionSolverFvMesh.H          | 11 ++++--
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.H |  8 ++--
 src/dynamicFvMesh/staticFvMesh/staticFvMesh.H |  8 ++--
 src/dynamicMesh/attachDetach/attachDetach.H   |  8 ++--
 src/dynamicMesh/boundaryMesh/boundaryMesh.H   |  8 ++--
 .../createShellMesh/createShellMesh.H         |  8 ++--
 .../fvMeshDistribute/fvMeshDistribute.H       |  8 ++--
 src/dynamicMesh/fvMeshSubset/fvMeshSubset.H   |  8 ++--
 .../layerAdditionRemoval.H                    |  8 ++--
 src/dynamicMesh/meshCut/cellCuts/cellCuts.H   |  8 ++--
 .../meshCut/cellLooper/cellLooper.H           |  8 ++--
 .../meshCut/cellLooper/geomCellLooper.H       |  8 ++--
 .../meshCut/cellLooper/hexCellLooper.H        |  8 ++--
 .../meshCut/cellLooper/topoCellLooper.H       |  8 ++--
 .../meshCut/directions/directions.H           |  8 ++--
 .../meshCut/edgeVertex/edgeVertex.H           |  8 ++--
 .../boundaryCutter/boundaryCutter.H           |  8 ++--
 .../meshCutAndRemove/meshCutAndRemove.H       |  8 ++--
 .../meshModifiers/meshCutter/meshCutter.H     |  8 ++--
 .../multiDirRefinement/multiDirRefinement.H   |  8 ++--
 .../undoableMeshCutter/undoableMeshCutter.H   |  8 ++--
 src/dynamicMesh/meshCut/splitCell/splitCell.H |  8 ++--
 .../meshSubsetHelper/meshSubsetHelper.H       |  4 +-
 .../motionSmoother/motionSmootherAlgo.H       |  8 ++--
 .../componentDisplacementMotionSolver.H       |  8 ++--
 .../componentVelocityMotionSolver.H           |  9 ++---
 .../displacement/displacementMotionSolver.H   |  8 ++--
 .../displacementInterpolationMotionSolver.H   |  8 ++--
 .../displacementLayeredMotionMotionSolver.H   |  8 ++--
 .../points0/points0MotionSolver.H             |  8 ++--
 .../solidBody/multiSolidBodyMotionSolver.H    |  8 ++--
 .../solidBodyMotionFunctions/SDA/SDA.H        |  8 ++--
 .../axisRotationMotion/axisRotationMotion.H   |  8 ++--
 .../linearMotion/linearMotion.H               |  8 ++--
 .../multiMotion/multiMotion.H                 |  8 ++--
 .../oscillatingLinearMotion.H                 |  8 ++--
 .../oscillatingRotatingMotion.H               |  8 ++--
 .../rotatingMotion/rotatingMotion.H           |  8 ++--
 .../solidBodyMotionFunction.H                 |  8 ++--
 .../tabulated6DoFMotion/tabulated6DoFMotion.H |  8 ++--
 .../solidBody/solidBodyMotionSolver.H         |  8 ++--
 .../velocityDisplacementMotionSolver.H        |  8 ++--
 .../velocity/velocityMotionSolver.H           | 11 ++----
 .../perfectInterface/perfectInterface.H       |  8 ++--
 .../pointPatchDist/pointPatchDist.H           |  8 ++--
 .../polyMeshFilter/polyMeshFilter.H           |  8 ++--
 .../attachPolyTopoChanger.H                   |  8 ++--
 .../polyMeshModifier/polyMeshModifier.H       |  8 ++--
 .../polyTopoChange/addPatchCellLayer.H        |  8 ++--
 .../polyTopoChange/combineFaces.H             |  8 ++--
 .../polyTopoChange/duplicatePoints.H          |  8 ++--
 .../polyTopoChange/edgeCollapser.H            |  8 ++--
 .../polyTopoChange/faceCollapser.H            |  8 ++--
 .../polyTopoChange/hexRef8/hexRef8.H          |  8 ++--
 .../polyTopoChange/hexRef8/hexRef8Data.H      |  8 ++--
 .../polyTopoChange/removeFaces.H              |  8 ++--
 .../polyTopoChange/removePoints.H             |  8 ++--
 .../polyTopoChange/tetDecomposer.H            |  8 ++--
 .../polyTopoChanger/polyTopoChanger.H         |  4 +-
 .../repatchPolyTopoChanger.H                  |  8 ++--
 src/dynamicMesh/setUpdater/setUpdater.H       |  8 ++--
 .../enrichedPatch/enrichedPatch.H             |  4 +-
 .../slidingInterface/slidingInterface.H       |  8 ++--
 src/engine/engineMesh/engineMesh/engineMesh.H |  8 ++--
 .../fvMotionSolverEngineMesh.H                |  8 ++--
 .../layeredEngineMesh/layeredEngineMesh.H     |  8 ++--
 .../staticEngineMesh/staticEngineMesh.H       |  8 ++--
 src/engine/enginePiston/enginePiston.H        |  8 ++--
 src/engine/engineTime/engineTime.H            |  8 ++--
 src/engine/engineValve/engineValve.H          |  8 ++--
 src/engine/engineValve/valveBank.H            |  8 ++--
 src/engine/ignition/ignition.H                |  8 ++--
 src/fileFormats/ensight/file/ensightFile.H    |  7 ++--
 src/fileFormats/ensight/file/ensightGeoFile.H |  8 ++--
 src/fileFormats/ensight/part/ensightCells.H   |  2 +-
 src/fileFormats/ensight/part/ensightFaces.H   |  2 +-
 .../ensight/read/ensightReadFile.H            |  8 ++--
 .../vtk/format/foamVtkAppendBase64Formatter.H |  4 +-
 .../vtk/format/foamVtkAppendRawFormatter.H    |  4 +-
 .../vtk/format/foamVtkAsciiFormatter.H        |  4 +-
 .../vtk/format/foamVtkBase64Formatter.H       |  4 +-
 .../vtk/format/foamVtkBase64Layer.H           |  4 +-
 .../vtk/format/foamVtkLegacyAsciiFormatter.H  |  4 +-
 .../vtk/format/foamVtkLegacyRawFormatter.H    |  4 +-
 .../vtk/read/vtkUnstructuredReader.H          |  4 +-
 .../faMesh/faBoundaryMesh/faBoundaryMesh.H    |  8 ++--
 .../faGlobalMeshData/faGlobalMeshData.H       |  8 ++--
 src/finiteArea/faMesh/faMesh.H                |  8 ++--
 src/finiteArea/faMesh/faMeshLduAddressing.H   |  8 ++--
 .../faMesh/faMeshMapper/faAreaMapper.H        |  8 ++--
 .../faMeshMapper/faBoundaryMeshMapper.H       |  8 ++--
 .../faMesh/faMeshMapper/faEdgeMapper.H        |  8 ++--
 .../faMesh/faMeshMapper/faMeshMapper.H        |  8 ++--
 .../faMesh/faMeshMapper/faPatchMapper.H       |  8 ++--
 src/finiteArea/faSolution/faSolution.H        |  8 ++--
 .../faPatchField/faPatchFieldMapperPatchRef.H |  8 ++--
 .../faConvectionScheme/faConvectionScheme.H   |  4 +-
 .../gaussFaConvectionScheme.H                 |  8 ++--
 .../EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H   |  8 ++--
 .../faD2dt2Scheme/faD2dt2Scheme.H             |  8 ++--
 .../EulerFaDdtScheme/EulerFaDdtScheme.H       |  8 ++--
 .../backwardFaDdtScheme/backwardFaDdtScheme.H |  4 +-
 .../boundedBackwardFaDdtScheme.H              |  8 ++--
 .../ddtSchemes/faDdtScheme/faDdtScheme.H      |  8 ++--
 .../steadyStateFaDdtScheme.H                  |  4 +-
 .../divSchemes/faDivScheme/faDivScheme.H      |  8 ++--
 .../gaussFaDivScheme/gaussFaDivScheme.H       |  4 +-
 .../finiteArea/faSchemes/faSchemes.H          |  8 ++--
 .../gradSchemes/faGradScheme/faGradScheme.H   |  4 +-
 .../gradSchemes/gaussFaGrad/gaussFaGrad.H     |  4 +-
 .../leastSquaresFaGrad/leastSquaresFaGrad.H   |  4 +-
 .../edgeLimitedFaGrad/edgeLimitedFaGrad.H     |  8 ++--
 .../faceLimitedFaGrad/faceLimitedFaGrad.H     |  8 ++--
 .../faLaplacianScheme/faLaplacianScheme.H     |  8 ++--
 .../gaussFaLaplacianScheme.H                  |  4 +-
 .../correctedLnGrad/correctedLnGrad.H         |  2 +-
 .../lnGradSchemes/fourthLnGrad/fourthLnGrad.H |  2 +-
 .../limitedLnGrad/limitedLnGrad.H             |  4 +-
 .../lnGradSchemes/lnGradScheme/lnGradScheme.H |  2 +-
 .../edgeInterpolationScheme.H                 |  2 +-
 .../schemes/NVDscheme/faNVDscheme.H           |  8 ++--
 .../blended/blendedEdgeInterpolation.H        |  8 ++--
 .../schemes/linear/linearEdgeInterpolation.H  |  4 +-
 .../schemes/upwind/upwindEdgeInterpolation.H  |  4 +-
 .../volSurfaceMapping/volSurfaceMapping.H     |  4 +-
 .../cfdTools/general/MRF/IOMRFZoneList.H      |  8 ++--
 .../cfdTools/general/MRF/MRFZone.H            |  8 ++--
 .../cfdTools/general/MRF/MRFZoneList.H        |  8 ++--
 .../general/SRF/SRFModel/SRFModel/SRFModel.H  |  8 ++--
 .../cfdTools/general/SRF/SRFModel/rpm/rpm.H   |  8 ++--
 .../general/coupling/externalFileCoupler.H    |  4 +-
 .../cfdTools/general/fvOptions/fvOptionList.H |  8 ++--
 .../cfdTools/general/fvOptions/fvOptions.H    |  8 ++--
 .../DarcyForchheimer/DarcyForchheimer.H       |  8 ++--
 .../porosityModel/fixedCoeff/fixedCoeff.H     |  8 ++--
 .../porosityModel/IOporosityModelList.H       |  8 ++--
 .../porosityModel/porosityModel.H             |  8 ++--
 .../porosityModel/porosityModelList.H         |  8 ++--
 .../general/porosityModel/powerLaw/powerLaw.H |  8 ++--
 .../solidification/solidification.H           |  8 ++--
 .../pimpleControl/pimpleControl.H             |  4 +-
 .../solutionControl/pisoControl/pisoControl.H |  8 ++--
 .../simpleControl/simpleControl.H             |  4 +-
 .../solutionControl/solutionControl.H         |  4 +-
 .../boundedConvectionScheme.H                 |  8 ++--
 .../gaussConvectionScheme.H                   |  8 ++--
 .../EulerD2dt2Scheme/EulerD2dt2Scheme.H       |  8 ++--
 .../steadyStateD2dt2Scheme.H                  |  8 ++--
 .../CoEulerDdtScheme/CoEulerDdtScheme.H       |  8 ++--
 .../CrankNicolsonDdtScheme.H                  |  4 +-
 .../EulerDdtScheme/EulerDdtScheme.H           |  8 ++--
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H  |  8 ++--
 .../backwardDdtScheme/backwardDdtScheme.H     |  8 ++--
 .../boundedDdtScheme/boundedDdtScheme.H       |  8 ++--
 .../localEulerDdtScheme/localEulerDdtScheme.H |  8 ++--
 .../steadyStateDdtScheme.H                    |  8 ++--
 .../gaussDivScheme/gaussDivScheme.H           |  8 ++--
 .../finiteVolume/fvSchemes/fvSchemes.H        |  8 ++--
 .../finiteVolume/fvSolution/fvSolution.H      |  8 ++--
 .../LeastSquaresGrad/LeastSquaresGrad.H       |  8 ++--
 .../gradSchemes/fourthGrad/fourthGrad.H       |  8 ++--
 .../gradSchemes/gaussGrad/gaussGrad.H         |  8 ++--
 .../leastSquaresGrad/leastSquaresGrad.H       |  8 ++--
 .../cellLimitedGrad/cellLimitedGrad.H         |  8 ++--
 .../cellMDLimitedGrad/cellMDLimitedGrad.H     |  8 ++--
 .../faceLimitedGrad/faceLimitedGrad.H         |  8 ++--
 .../faceMDLimitedGrad/faceMDLimitedGrad.H     |  8 ++--
 .../gaussLaplacianScheme.H                    |  8 ++--
 .../CentredFitSnGrad/CentredFitSnGradScheme.H |  8 ++--
 .../correctedSnGrad/correctedSnGrad.H         |  4 +-
 .../faceCorrectedSnGrad/faceCorrectedSnGrad.H |  4 +-
 .../limitedSnGrad/limitedSnGrad.H             |  4 +-
 .../orthogonalSnGrad/orthogonalSnGrad.H       |  4 +-
 .../uncorrectedSnGrad/uncorrectedSnGrad.H     |  4 +-
 .../fieldSelection/fieldSelection.H           |  2 +-
 .../fieldSelection/fileFieldSelection.H       |  2 +-
 .../fieldSelection/solverFieldSelection.H     |  2 +-
 .../fieldSelection/volFieldSelection.H        |  2 +-
 .../fvMeshFunctionObject.H                    |  4 +-
 .../isoAdvection/isoAdvection/isoAdvection.H  |  8 ++--
 .../extendedCentredCellToCellStencil.H        |  8 ++--
 .../extendedCentredCellToFaceStencil.H        |  8 ++--
 .../extendedUpwindCellToFaceStencil.H         | 11 ++++--
 .../extendedCentredFaceToCellStencil.H        |  8 ++--
 .../fvMesh/fvBoundaryMesh/fvBoundaryMesh.H    |  8 ++--
 src/finiteVolume/fvMesh/fvMesh.H              |  4 +-
 src/finiteVolume/fvMesh/fvMeshLduAddressing.H |  8 ++--
 .../fvMeshMapper/fvBoundaryMeshMapper.H       |  8 ++--
 .../fvMesh/fvMeshMapper/fvMeshMapper.H        |  8 ++--
 .../fvMesh/fvMeshMapper/fvPatchMapper.H       | 11 ++----
 .../fvMesh/fvMeshMapper/fvSurfaceMapper.H     |  8 ++--
 .../fvMesh/fvPatches/fvPatch/fvPatch.H        |  8 ++--
 .../singleCellFvMesh/singleCellFvMesh.H       |  8 ++--
 .../wallDist/nearWallDist/nearWallDist.H      |  8 ++--
 .../nearWallDist/nearWallDistNoSearch.H       |  8 ++--
 .../Poisson/PoissonPatchDistMethod.H          |  8 ++--
 .../advectionDiffusionPatchDistMethod.H       |  8 ++--
 .../meshWave/meshWavePatchDistMethod.H        |  8 ++--
 .../meshWave/wallDistData/wallDistData.H      |  8 ++--
 .../patchDistMethod/patchDistMethod.H         |  8 ++--
 .../fvMesh/wallDist/wallDist/wallDist.H       |  8 ++--
 .../LimitedScheme/LimitedScheme.H             |  8 ++--
 .../limitedSchemes/PhiScheme/PhiScheme.H      |  8 ++--
 .../limitedSchemes/blended/blended.H          |  8 ++--
 .../limitedSchemes/limitWith/limitWith.H      |  8 ++--
 .../limitedSurfaceInterpolationScheme.H       |  8 ++--
 .../limitedSchemes/upwind/upwind.H            |  4 +-
 .../multivariateIndependentScheme.H           | 11 ++++--
 .../multivariateScheme/multivariateScheme.H   |  8 ++--
 .../multivariateSelectionScheme.H             | 11 ++++--
 .../upwind/multivariateUpwind.H               |  8 ++--
 .../CentredFitScheme/CentredFitScheme.H       |  8 ++--
 .../schemes/CoBlended/CoBlended.H             |  8 ++--
 .../surfaceInterpolation/schemes/LUST/LUST.H  |  8 ++--
 .../PureUpwindFitScheme/PureUpwindFitScheme.H |  8 ++--
 .../schemes/UpwindFitScheme/UpwindFitScheme.H |  8 ++--
 .../schemes/cellCoBlended/cellCoBlended.H     |  8 ++--
 .../schemes/clippedLinear/clippedLinear.H     |  4 +-
 .../schemes/cubic/cubic.H                     |  8 ++--
 .../deferredCorrection/deferredCorrection.H   |  4 +-
 .../schemes/downwind/downwind.H               |  4 +-
 .../schemes/fixedBlended/fixedBlended.H       |  8 ++--
 .../schemes/harmonic/harmonic.H               |  4 +-
 .../schemes/limiterBlended/limiterBlended.H   |  8 ++--
 .../schemes/linear/linear.H                   |  4 +-
 .../schemes/linearUpwind/linearUpwind.H       |  8 ++--
 .../schemes/linearUpwind/linearUpwindV.H      |  8 ++--
 .../schemes/localBlended/localBlended.H       |  8 ++--
 .../schemes/localMax/localMax.H               |  4 +-
 .../schemes/localMin/localMin.H               |  4 +-
 .../schemes/midPoint/midPoint.H               |  4 +-
 .../outletStabilised/outletStabilised.H       |  8 ++--
 .../schemes/pointLinear/pointLinear.H         |  8 ++--
 .../schemes/reverseLinear/reverseLinear.H     |  4 +-
 .../schemes/skewCorrected/skewCorrected.H     |  8 ++--
 .../schemes/weighted/weighted.H               |  4 +-
 .../volPointInterpolation/pointConstraints.H  |  8 ++--
 src/functionObjects/field/Curle/Curle.H       |  4 +-
 .../field/DESModelRegions/DESModelRegions.H   |  4 +-
 .../field/XiReactionRate/XiReactionRate.H     |  8 ++--
 src/functionObjects/field/ddt2/ddt2.H         |  4 +-
 .../field/externalCoupled/externalCoupled.H   |  4 +-
 .../extractEulerianParticles.H                |  8 ++--
 .../field/fieldAverage/fieldAverage.H         |  4 +-
 .../field/fieldExpression/fieldExpression.H   |  8 ++--
 .../field/fieldMinMax/fieldMinMax.H           |  4 +-
 .../field/fieldsExpression/fieldsExpression.H |  8 ++--
 .../field/fluxSummary/fluxSummary.H           |  4 +-
 .../heatTransferCoeff/heatTransferCoeff.H     |  4 +-
 .../ReynoldsAnalogy/ReynoldsAnalogy.H         |  4 +-
 .../fixedReferenceTemperature.H               |  4 +-
 .../heatTransferCoeffModel.H                  |  4 +-
 .../localReferenceTemperature.H               |  4 +-
 .../field/histogram/histogram.H               |  8 ++--
 .../field/mapFields/mapFields.H               |  4 +-
 .../field/nearWallFields/nearWallFields.H     |  8 ++--
 .../particleDistribution.H                    |  4 +-
 .../field/processorField/processorField.H     |  8 ++--
 .../reactionsSensitivityAnalysis.H            | 11 ++++--
 .../field/readFields/readFields.H             |  8 ++--
 .../regionSizeDistribution.H                  |  8 ++--
 .../field/streamLine/streamLine.H             |  4 +-
 .../streamLine/streamLineParticleCloud.H      |  8 ++--
 .../surfaceInterpolate/surfaceInterpolate.H   |  8 ++--
 .../field/turbulenceFields/turbulenceFields.H |  4 +-
 .../field/valueAverage/valueAverage.H         |  4 +-
 .../wallBoundedStreamLine.H                   |  4 +-
 .../wallBoundedStreamLineParticleCloud.H      |  8 ++--
 .../field/wallHeatFlux/wallHeatFlux.H         |  8 ++--
 .../field/wallShearStress/wallShearStress.H   |  8 ++--
 .../field/writeCellCentres/writeCellCentres.H |  8 ++--
 .../field/writeCellVolumes/writeCellVolumes.H |  8 ++--
 src/functionObjects/field/yPlus/yPlus.H       |  8 ++--
 .../field/zeroGradient/zeroGradient.H         |  4 +-
 .../forces/forceCoeffs/forceCoeffs.H          |  8 ++--
 src/functionObjects/forces/forces/forces.H    |  8 ++--
 .../fieldVisualisationBase.H                  |  8 ++--
 .../functionObjectBase.H                      |  8 ++--
 .../functionObjectCloud.H                     |  4 +-
 .../functionObjectLine.H                      |  4 +-
 .../functionObjectSurface.H                   |  4 +-
 .../runTimePostProcessing/geometryBase.H      |  8 ++--
 .../runTimePostProcessing/geometrySurface.H   |  4 +-
 .../graphics/runTimePostProcessing/pathline.H |  4 +-
 .../runTimePostProcessing/pointData.H         |  4 +-
 .../graphics/runTimePostProcessing/scene.H    |  8 ++--
 .../graphics/runTimePostProcessing/surface.H  |  4 +-
 .../graphics/runTimePostProcessing/text.H     |  4 +-
 .../lagrangian/cloudInfo/cloudInfo.H          |  8 ++--
 .../lagrangian/dsmcFields/dsmcFields.H        |  8 ++--
 .../icoUncoupledKinematicCloud.H              |  8 ++--
 .../solvers/energyTransport/energyTransport.H |  4 +-
 .../solvers/scalarTransport/scalarTransport.H |  4 +-
 src/functionObjects/utilities/abort/abort.H   |  4 +-
 .../codedFunctionObject/codedFunctionObject.H |  8 ++--
 .../removeRegisteredObject.H                  |  8 ++--
 .../utilities/residuals/residuals.H           |  4 +-
 .../utilities/runTimeControl/runTimeControl.H |  8 ++--
 .../setTimeStep/setTimeStepFunctionObject.H   |  8 ++--
 .../utilities/systemCall/systemCall.H         |  4 +-
 .../thermoCoupleProbes/thermoCoupleProbes.H   |  8 ++--
 .../timeActivatedFileUpdate.H                 |  8 ++--
 .../writeDictionary/writeDictionary.H         |  8 ++--
 .../utilities/writeObjects/writeObjects.H     |  4 +-
 .../MGridGenGAMGAgglomeration.H               |  8 ++--
 .../pairPatchAgglomeration.H                  |  8 ++--
 ...lacementComponentLaplacianFvMotionSolver.H | 11 ++++--
 ...velocityComponentLaplacianFvMotionSolver.H | 11 ++++--
 .../displacementSBRStressFvMotionSolver.H     |  8 ++--
 .../displacementLaplacianFvMotionSolver.H     |  8 ++--
 ...dBodyDisplacementLaplacianFvMotionSolver.H | 13 ++++---
 .../surfaceAlignedSBRStressFvMotionSolver.H   |  8 ++--
 .../velocityLaplacianFvMotionSolver.H         |  8 ++--
 .../directional/directionalDiffusivity.H      |  8 ++--
 .../motionDiffusivity/file/fileDiffusivity.H  |  8 ++--
 .../inverseDistanceDiffusivity.H              |  8 ++--
 .../inverseFaceDistanceDiffusivity.H          | 11 ++++--
 .../inversePointDistanceDiffusivity.H         | 11 ++++--
 .../inverseVolume/inverseVolumeDiffusivity.H  |  8 ++--
 .../exponential/exponentialDiffusivity.H      |  8 ++--
 .../quadratic/quadraticDiffusivity.H          |  8 ++--
 .../motionDirectionalDiffusivity.H            | 11 ++++--
 .../uniform/uniformDiffusivity.H              |  8 ++--
 .../motionInterpolation/motionInterpolation.H |  8 ++--
 ...surfaceDisplacementPointPatchVectorField.H |  7 +++-
 ...aceSlipDisplacementPointPatchVectorField.H |  7 +++-
 .../fixedTemperatureConstraint.H              |  8 ++--
 .../velocityDampingConstraint.H               |  8 ++--
 .../limitTemperature/limitTemperature.H       |  8 ++--
 .../corrections/limitVelocity/limitVelocity.H |  8 ++--
 .../acousticDampingSource.H                   |  6 +--
 .../actuationDiskSource/actuationDiskSource.H |  8 ++--
 .../derived/buoyancyEnergy/buoyancyEnergy.H   |  8 ++--
 .../derived/buoyancyForce/buoyancyForce.H     |  8 ++--
 ...irectionalPressureGradientExplicitSource.H | 11 ++++--
 .../effectivenessHeatExchangerSource.H        |  8 ++--
 .../explicitPorositySource.H                  |  8 ++--
 .../jouleHeatingSource/jouleHeatingSource.H   |  8 ++--
 .../meanVelocityForce/meanVelocityForce.H     |  8 ++--
 .../patchMeanVelocityForce.H                  |  8 ++--
 .../radialActuationDiskSource.H               |  8 ++--
 .../solidificationMeltingSource.H             | 11 ++++--
 .../tabulated6DoFAcceleration.H               |  8 ++--
 .../tabulatedAccelerationSource.H             | 11 ++++--
 .../viscousDissipation/viscousDissipation.H   |  4 +-
 .../interRegionExplicitPorositySource.H       |  8 ++--
 .../clouds/Templates/DSMCCloud/DSMCCloud.H    |  8 ++--
 .../baseClasses/DSMCBaseCloud/DSMCBaseCloud.H |  8 ++--
 .../basic/InteractionLists/InteractionLists.H |  8 ++--
 .../indexedParticle/indexedParticleCloud.H    |  8 ++--
 .../injectedParticle/injectedParticleCloud.H  |  8 ++--
 .../passiveParticle/passiveParticleCloud.H    |  8 ++--
 .../IntegrationScheme/IntegrationScheme.H     |  4 +-
 .../Templates/CollidingCloud/CollidingCloud.H |  8 ++--
 .../Templates/KinematicCloud/KinematicCloud.H |  8 ++--
 .../cloudSolution/cloudSolution.H             |  4 +-
 .../clouds/Templates/MPPICCloud/MPPICCloud.H  |  8 ++--
 .../Templates/ReactingCloud/ReactingCloud.H   |  8 ++--
 .../ReactingMultiphaseCloud.H                 |  8 ++--
 .../Templates/ThermoCloud/ThermoCloud.H       |  8 ++--
 .../kinematicCloud/kinematicCloud.H           |  8 ++--
 .../baseClasses/reactingCloud/reactingCloud.H |  8 ++--
 .../reactingMultiphaseCloud.H                 |  8 ++--
 .../baseClasses/thermoCloud/thermoCloud.H     |  8 ++--
 .../CorrectionLimitingMethod.H                |  4 +-
 .../ParticleStressModel/ParticleStressModel.H |  4 +-
 .../TimeScaleModel/TimeScaleModel.H           |  4 +-
 .../correlationFunction/correlationFunction.H |  8 ++--
 .../molecule/moleculeCloud/moleculeCloud.H    |  8 ++--
 .../molecule/reducedUnits/reducedUnits.C      | 28 +-------------
 .../molecule/reducedUnits/reducedUnits.H      | 38 ++++++++-----------
 .../basic/energyScalingFunction.H             |  8 ++--
 .../pairPotential/basic/pairPotential.H       |  8 ++--
 .../pairPotentialList/pairPotentialList.H     |  8 ++--
 .../potential/potential/potential.H           |  8 ++--
 .../tetherPotential/basic/tetherPotential.H   |  8 ++--
 .../tetherPotentialList/tetherPotentialList.H |  8 ++--
 .../solidParticle/solidParticleCloud.H        |  8 ++--
 .../clouds/Templates/SprayCloud/SprayCloud.H  |  8 ++--
 .../baseClasses/sprayCloud/sprayCloud.H       |  8 ++--
 src/lumpedPointMotion/lumpedPointIOMovement.H |  4 +-
 src/lumpedPointMotion/lumpedPointMovement.H   |  4 +-
 .../blockDescriptor/blockDescriptor.H         |  4 +-
 .../blockEdges/BSplineEdge/BSpline.H          |  8 ++--
 .../blockEdges/BSplineEdge/BSplineEdge.H      |  8 ++--
 .../blockMesh/blockEdges/arcEdge/arcEdge.H    |  8 ++--
 src/mesh/blockMesh/blockEdges/bezier/bezier.H |  8 ++--
 .../blockEdges/polyLineEdge/polyLine.H        |  8 ++--
 .../blockEdges/polyLineEdge/polyLineEdge.H    |  8 ++--
 .../projectCurveEdge/projectCurveEdge.H       |  8 ++--
 .../blockEdges/projectEdge/projectEdge.H      |  8 ++--
 .../blockEdges/splineEdge/CatmullRomSpline.H  |  8 ++--
 .../blockEdges/splineEdge/splineEdge.H        |  8 ++--
 .../blockFaces/projectFace/projectFace.H      |  8 ++--
 .../projectVertex/projectVertex.H             |  8 ++--
 src/mesh/blockMesh/blocks/block/block.H       |  8 ++--
 .../extrudeModel/extrudeModel/extrudeModel.H  |  8 ++--
 .../displacementMeshMoverMotionSolver.H       |  8 ++--
 .../externalDisplacementMeshMover.H           |  8 ++--
 .../fieldSmoother/fieldSmoother.H             |  8 ++--
 .../medialAxisMeshMover.H                     |  8 ++--
 .../meshRefinement/meshRefinement.H           |  8 ++--
 .../refinementSurfaces/refinementSurfaces.H   |  8 ++--
 .../refinementSurfaces/surfaceZonesInfo.H     |  4 +-
 .../layerParameters/layerParameters.H         |  8 ++--
 .../refinementParameters.H                    |  8 ++--
 .../snapParameters/snapParameters.H           |  8 ++--
 .../snappyHexMeshDriver/snappyLayerDriver.H   |  8 ++--
 .../snappyHexMeshDriver/snappyRefineDriver.H  |  8 ++--
 .../snappyHexMeshDriver/snappySnapDriver.H    |  8 ++--
 .../AMIInterpolation/AMIInterpolation.H       |  8 ++--
 .../AMIMethod/AMIMethod/AMIMethod.H           |  8 ++--
 .../AMIMethod/directAMI/directAMI.H           |  8 ++--
 .../faceAreaWeightAMI/faceAreaWeightAMI.H     |  8 ++--
 .../AMIMethod/mapNearestAMI/mapNearestAMI.H   |  8 ++--
 .../partialFaceAreaWeightAMI.H                |  8 ++--
 .../cyclicACMIGAMGInterfaceField.H            | 11 ++++--
 .../cyclicAMIGAMGInterfaceField.H             | 11 ++++--
 .../cyclicACMIGAMGInterface.H                 |  8 ++--
 .../cyclicAMIGAMGInterface.H                  |  8 ++--
 .../cyclicACMIPointPatch.H                    |  8 ++--
 .../cyclicAMIPointPatch/cyclicAMIPointPatch.H |  8 ++--
 src/meshTools/algorithms/MeshWave/MeshWave.H  |  8 ++--
 .../PatchEdgeFaceWave/PatchEdgeFaceWave.H     |  8 ++--
 .../algorithms/PointEdgeWave/PointEdgeWave.H  |  8 ++--
 src/meshTools/cellDist/cellDistFuncs.H        |  8 ++--
 src/meshTools/cellFeatures/cellFeatures.H     |  8 ++--
 src/meshTools/cellQuality/cellQuality.H       |  8 ++--
 .../coordinateSystems/coordinateSystems.H     |  4 +-
 .../edgeMeshFormats/edgeMesh/edgeMeshFormat.H |  8 ++--
 .../extendedFeatureEdgeMeshFormat.H           | 11 ++++--
 .../edgeMeshFormats/nas/NASedgeFormat.H       |  4 +-
 .../edgeMeshFormats/obj/OBJedgeFormat.H       |  4 +-
 .../edgeMeshFormats/starcd/STARCDedgeFormat.H |  4 +-
 .../edgeMeshFormats/vtk/VTKedgeFormat.H       |  8 ++--
 .../extendedEdgeMeshFormat.H                  |  8 ++--
 src/meshTools/meshSearch/meshSearch.H         |  8 ++--
 .../regionCoupledGAMGInterfaceField.H         |  8 ++--
 .../regionCoupledWallGAMGInterfaceField.H     |  8 ++--
 .../regionCoupledBaseGAMGInterface.H          | 11 ++++--
 .../regionCoupledGAMGInterface.H              |  8 ++--
 .../regionCoupledWallGAMGInterface.H          | 11 ++++--
 src/meshTools/regionSplit2D/regionSplit2D.H   |  8 ++--
 .../closedTriSurfaceMesh.H                    |  8 ++--
 .../searchableBox/searchableBox.H             |  8 ++--
 .../searchableCone/searchableCone.H           |  8 ++--
 .../searchableCylinder/searchableCylinder.H   |  8 ++--
 .../searchableDisk/searchableDisk.H           |  8 ++--
 .../searchableExtrudedCircle.H                |  8 ++--
 .../searchablePlane/searchablePlane.H         |  8 ++--
 .../searchablePlate/searchablePlate.H         |  8 ++--
 .../searchableRotatedBox.H                    |  8 ++--
 .../searchableSphere/searchableSphere.H       |  8 ++--
 .../searchableSurface/searchableSurface.H     |  8 ++--
 .../searchableSurfaceCollection.H             | 11 ++++--
 .../searchableSurfaceWithGaps.H               |  8 ++--
 .../searchableSurfaces/searchableSurfaces.H   |  8 ++--
 .../triSurfaceMesh/triSurfaceMesh.H           |  8 ++--
 .../sets/topoSetSource/topoSetSource.H        |  4 +-
 src/meshTools/sets/topoSets/cellSet.H         |  2 +-
 src/meshTools/sets/topoSets/topoSet.H         |  2 +-
 .../triSurfaceLoader/triSurfaceLoader.H       |  4 +-
 .../triSurfaceSearch/triSurfaceRegionSearch.H |  8 ++--
 .../triSurfaceSearch/triSurfaceSearch.H       |  4 +-
 .../twoDPointCorrector/twoDPointCorrector.H   |  8 ++--
 .../cellCellStencil/cellCellStencil.H         |  8 ++--
 .../cellVolumeWeightCellCellStencil.H         |  8 ++--
 .../inverseDistanceCellCellStencil.H          |  8 ++--
 .../inverseDistance/waveMethod.H              |  8 ++--
 .../leastSquaresCellCellStencil.H             |  8 ++--
 .../trackingInverseDistanceCellCellStencil.H  |  8 ++--
 .../dynamicOversetFvMesh.H                    |  8 ++--
 .../fvMeshPrimitiveLduAddressing.H            | 11 ++++--
 .../lduPrimitiveProcessorInterface.H          | 11 ++++--
 .../oversetPolyPatch/oversetGAMGInterface.H   |  8 ++--
 .../oversetGAMGInterfaceField.H               |  8 ++--
 .../semiImplicitOversetGAMGInterfaceField.H   |  8 ++--
 .../decompose/decompositionInformation.H      |  4 +-
 .../decompose/decompose/fvFieldDecomposer.H   |  8 ++--
 .../distributedTriSurfaceMesh.H               |  8 ++--
 .../reconstruct/fvFieldReconstructor.H        |  8 ++--
 .../reconstruct/pointFieldReconstructor.H     |  8 ++--
 .../reconstruct/reconstruct/processorMeshes.H |  8 ++--
 .../noise/noiseModels/noiseModel/noiseModel.H |  8 ++--
 .../pyrolysisModels/noPyrolysis/noPyrolysis.H |  8 ++--
 .../pyrolysisModel/pyrolysisModel.H           |  8 ++--
 .../pyrolysisModel/pyrolysisModelCollection.H |  8 ++--
 .../reactingOneDim/reactingOneDim.H           |  8 ++--
 .../pyrolysisModels/thermo/thermo.H           |  8 ++--
 .../regionModel/regionModel/regionModel.H     |  8 ++--
 .../regionModel/regionModel1D/regionModel1D.H |  8 ++--
 .../regionProperties/regionProperties.H       |  4 +-
 .../singleLayerRegion/singleLayerRegion.H     |  8 ++--
 .../kinematicSingleLayer.H                    |  8 ++--
 .../surfaceFilmModels/noFilm/noFilm.H         |  8 ++--
 .../constantFilmThermo/constantFilmThermo.H   |  8 ++--
 .../filmThermoModel/filmThermoModel.H         |  8 ++--
 .../liquidFilmThermo/liquidFilmThermo.H       |  8 ++--
 .../filmTurbulenceModel/filmTurbulenceModel.H |  8 ++--
 .../filmTurbulenceModel/laminar/laminar.H     |  8 ++--
 .../contactAngleForce/contactAngleForce.H     |  8 ++--
 .../distributionContactAngleForce.H           | 11 ++++--
 ...bedTemperatureDependentContactAngleForce.H | 11 ++++--
 .../temperatureDependentContactAngleForce.H   |  8 ++--
 .../submodels/kinematic/force/force/force.H   |  8 ++--
 .../thermocapillaryForce.H                    |  8 ++--
 .../BrunDrippingInjection.H                   |  8 ++--
 .../curvatureSeparation/curvatureSeparation.H |  8 ++--
 .../drippingInjection/drippingInjection.H     |  8 ++--
 .../injectionModel/injectionModel.H           |  8 ++--
 .../injectionModelList/injectionModelList.H   |  8 ++--
 .../patchInjection/patchInjection.H           |  8 ++--
 .../transferModel/transferModel.H             |  8 ++--
 .../transferModelList/transferModelList.H     |  8 ++--
 .../constantRadiation/constantRadiation.H     |  8 ++--
 .../filmRadiationModel/filmRadiationModel.H   |  8 ++--
 .../noRadiation/noRadiation.H                 |  8 ++--
 .../primaryRadiation/primaryRadiation.H       |  8 ++--
 .../standardRadiation/standardRadiation.C     |  6 ---
 .../standardRadiation/standardRadiation.H     | 10 ++---
 .../ArrheniusViscosity/ArrheniusViscosity.H   |  8 ++--
 .../constantViscosity/constantViscosity.H     |  8 ++--
 .../filmViscosityModel/filmViscosityModel.H   |  8 ++--
 .../function1Viscosity/function1Viscosity.H   |  8 ++--
 .../liquidViscosity/liquidViscosity.H         |  8 ++--
 .../thixotropicViscosity.H                    |  8 ++--
 .../constantHeatTransfer.H                    |  8 ++--
 .../heatTransferModel/heatTransferModel.H     |  8 ++--
 .../mappedConvectiveHeatTransfer.H            | 11 ++++--
 .../noPhaseChange/noPhaseChange.H             |  8 ++--
 .../phaseChangeModel/phaseChangeModel.H       |  8 ++--
 .../solidification/solidification.H           |  8 ++--
 .../standardPhaseChange/standardPhaseChange.C |  6 ---
 .../standardPhaseChange/standardPhaseChange.H | 19 ++++------
 .../surfaceFilmModel/surfaceFilmModel.H       |  8 ++--
 .../surfaceFilmRegionModel.H                  |  8 ++--
 .../thermoSingleLayer/thermoSingleLayer.H     |  8 ++--
 .../thermalBaffleModels/noThermo/noThermo.H   |  8 ++--
 .../thermalBaffle/thermalBaffle.H             |  8 ++--
 .../thermalBaffleModel/thermalBaffleModel.H   |  8 ++--
 src/renumber/SloanRenumber/SloanRenumber.H    |  8 ++--
 .../CuthillMcKeeRenumber.H                    | 11 +++---
 .../manualRenumber/manualRenumber.H           | 10 ++---
 .../randomRenumber/randomRenumber.H           | 11 +++---
 .../renumberMethod/renumberMethod.H           | 11 +++---
 .../springRenumber/springRenumber.H           | 11 +++---
 .../structuredRenumber/structuredRenumber.H   |  6 ++-
 src/renumber/zoltanRenumber/zoltanRenumber.H  | 11 +++---
 .../rigidBodyMotion/rigidBodyMotion.H         |  8 ++--
 .../rigidBodyMeshMotion/rigidBodyMeshMotion.H |  4 +-
 .../rigidBodyMeshMotionSolver.H               |  8 ++--
 .../cellVolumeWeight/cellVolumeWeightMethod.H |  8 ++--
 .../correctedCellVolumeWeightMethod.H         | 11 ++++--
 .../calcMethod/direct/directMethod.H          |  8 ++--
 .../calcMethod/mapNearest/mapNearestMethod.H  |  8 ++--
 .../meshToMeshMethod/meshToMeshMethod.H       |  8 ++--
 src/sampling/meshToMesh/meshToMesh.H          |  8 ++--
 src/sampling/probes/patchProbes.H             |  8 ++--
 src/sampling/probes/probes.H                  |  4 +-
 .../sampledSet/sampledSets/sampledSets.H      |  4 +-
 .../sixDoFRigidBodyMotionSolver.H             |  8 ++--
 .../sixDoFRigidBodyState.H                    |  8 ++--
 src/surfMesh/mergedSurf/mergedSurf.H          |  2 +-
 src/surfMesh/meshedSurf/meshedSurfRef.H       |  2 +-
 .../surfaceFormats/ac3d/AC3DsurfaceFormat.H   |  4 +-
 .../surfaceFormats/fire/FLMAsurfaceFormat.H   |  8 ++--
 .../surfaceFormats/gts/GTSsurfaceFormat.H     |  4 +-
 .../surfaceFormats/nas/NASsurfaceFormat.H     |  4 +-
 .../surfaceFormats/obj/OBJsurfaceFormat.H     |  4 +-
 .../surfaceFormats/off/OFFsurfaceFormat.H     |  4 +-
 .../surfaceFormats/smesh/SMESHsurfaceFormat.H |  4 +-
 .../starcd/STARCDsurfaceFormat.H              |  4 +-
 src/surfMesh/surfaceFormats/tri/TRIReader.H   |  4 +-
 .../surfaceFormats/tri/TRIsurfaceFormat.H     |  4 +-
 .../surfaceFormats/vtk/VTKsurfaceFormat.H     |  4 +-
 .../surfaceFormats/vtp/VTPsurfaceFormat.H     |  4 +-
 .../surfaceFormats/x3d/X3DsurfaceFormat.H     |  4 +-
 .../surfaceRegistry/surfaceRegistry.H         |  4 +-
 .../barotropicCompressibilityModel.H          | 11 ++++--
 .../TDACChemistryModel/TDACChemistryModel.H   |  8 ++--
 .../TDACChemistryModel/tabulation/ISAT/ISAT.H |  4 +-
 .../noChemistryTabulation.H                   |  4 +-
 .../basicChemistryModel/basicChemistryModel.H |  4 +-
 .../chemistryModel/chemistryModel.H           |  8 ++--
 .../psiChemistryModel/psiChemistryModel.H     |  4 +-
 .../rhoChemistryModel/rhoChemistryModel.H     |  4 +-
 .../specieReactionRates/specieReactionRates.H |  8 ++--
 .../radiation/fvOptions/radiation/radiation.H |  8 ++--
 .../radiation/radiationModels/P1/P1.H         |  8 ++--
 .../radiationModels/fvDOM/fvDOM/fvDOM.H       |  8 ++--
 .../radiativeIntensityRay.H                   |  8 ++--
 .../radiationModels/noRadiation/noRadiation.H |  8 ++--
 .../radiationModels/opaqueSolid/opaqueSolid.H |  8 ++--
 .../radiationModel/radiationModel.H           |  8 ++--
 .../solarLoad/faceShading/faceShading.H       |  8 ++--
 .../radiationModels/solarLoad/solarLoad.H     |  8 ++--
 .../radiationModels/viewFactor/viewFactor.H   |  8 ++--
 .../solarCalculator/solarCalculator.H         |  8 ++--
 .../chemistryReader/chemistryReader.H         |  8 ++--
 .../chemkinReader/chemkinReader.H             |  8 ++--
 .../foamChemistryReader/foamChemistryReader.H |  8 ++--
 .../moleFractions/moleFractions.H             |  8 ++--
 .../reactingMixture/reactingMixture.H         |  8 ++--
 .../singleStepReactingMixture.H               |  8 ++--
 .../basicSolidChemistryModel.H                |  4 +-
 .../pyrolysisChemistryModel.H                 |  4 +-
 .../solidChemistryModel/solidChemistryModel.H |  8 ++--
 .../Reactions/solidReaction/solidReaction.H   |  4 +-
 .../IrreversibleReaction.H                    |  4 +-
 .../NonEquilibriumReversibleReaction.H        |  8 ++--
 .../Reactions/ReactionList/ReactionList.H     |  4 +-
 .../ReversibleReaction/ReversibleReaction.H   |  4 +-
 .../dynamicMotionSolverTopoFvMesh.H           | 11 ++++--
 .../linearValveFvMesh/linearValveFvMesh.H     |  8 ++--
 .../linearValveLayersFvMesh.H                 |  8 ++--
 .../mixerFvMesh/mixerFvMesh.H                 |  8 ++--
 .../movingConeTopoFvMesh.H                    |  8 ++--
 .../rawTopoChangerFvMesh.H                    |  8 ++--
 .../topoChangerFvMesh/topoChangerFvMesh.H     |  8 ++--
 .../compressibleTransportModel.H              |  8 ++--
 .../singlePhaseTransportModel.H               |  8 ++--
 .../transportModel/transportModel.H           |  8 ++--
 .../viscosityModel/viscosityModel.H           |  8 ++--
 .../interfaceProperties/interfaceProperties.H |  8 ++--
 .../base/regularWaveModel/regularWaveModel.H  |  8 ++--
 976 files changed, 3606 insertions(+), 3419 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
index ccec0b0e84..12cfaf2664 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
@@ -94,11 +94,11 @@ class basicSubGrid
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        basicSubGrid(const basicSubGrid&);
+        //- No copy construct
+        basicSubGrid(const basicSubGrid&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const basicSubGrid&);
+        //- No copy assignment
+        void operator=(const basicSubGrid&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
index cb9ee61b09..fabbd53eb5 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
@@ -82,11 +82,11 @@ class basicSubGrid
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        basicSubGrid(const basicSubGrid&);
+        //- No copy construct
+        basicSubGrid(const basicSubGrid&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const basicSubGrid&);
+        //- No copy assignment
+        void operator=(const basicSubGrid&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
index 7c06ab6e79..66c1abb44a 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
@@ -74,11 +74,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        PDRDragModel(const PDRDragModel&);
+        //- No copy construct
+        PDRDragModel(const PDRDragModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PDRDragModel&);
+        //- No copy assignment
+        void operator=(const PDRDragModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
index b9596072bc..316c55a273 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
@@ -108,11 +108,11 @@ class basic
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        basic(const basic&);
+        //- No copy construct
+        basic(const basic&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const basic&);
+        //- No copy assignment
+        void operator=(const basic&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
index 72fd9bb8ae..2b4368f635 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
@@ -70,11 +70,11 @@ class Gulder
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        Gulder(const Gulder&);
+        //- No copy construct
+        Gulder(const Gulder&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const Gulder&);
+        //- No copy assignment
+        void operator=(const Gulder&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
index 79e68edb20..49444c2ca0 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
@@ -66,11 +66,11 @@ class SCOPEBlend
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        SCOPEBlend(const SCOPEBlend&);
+        //- No copy construct
+        SCOPEBlend(const SCOPEBlend&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const SCOPEBlend&);
+        //- No copy assignment
+        void operator=(const SCOPEBlend&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
index 6679553a4d..3d2efc313d 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
@@ -84,11 +84,11 @@ class SCOPEXiEq
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        SCOPEXiEq(const SCOPEXiEq&);
+        //- No copy construct
+        SCOPEXiEq(const SCOPEXiEq&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const SCOPEXiEq&);
+        //- No copy assignment
+        void operator=(const SCOPEXiEq&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
index 55dbd0fa2b..fa11f2ccbd 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
@@ -79,11 +79,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        XiEqModel(const XiEqModel&);
+        //- No copy construct
+        XiEqModel(const XiEqModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const XiEqModel&);
+        //- No copy assignment
+        void operator=(const XiEqModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
index 1a287c7ce3..a5b5067074 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
@@ -65,11 +65,11 @@ class instability
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        instability(const instability&);
+        //- No copy construct
+        instability(const instability&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const instability&);
+        //- No copy assignment
+        void operator=(const instability&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
index 88b6e81d1a..c23dd73caa 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
@@ -60,11 +60,11 @@ class KTS
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        KTS(const KTS&);
+        //- No copy construct
+        KTS(const KTS&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const KTS&);
+        //- No copy assignment
+        void operator=(const KTS&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
index 49bc8aa196..c9eef267ef 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
@@ -70,11 +70,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        XiGModel(const XiGModel&);
+        //- No copy construct
+        XiGModel(const XiGModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const XiGModel&);
+        //- No copy assignment
+        void operator=(const XiGModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
index bffe08d60e..8246bb0db6 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
@@ -69,11 +69,11 @@ class instabilityG
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        instabilityG(const instabilityG&);
+        //- No copy construct
+        instabilityG(const instabilityG&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const instabilityG&);
+        //- No copy assignment
+        void operator=(const instabilityG&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
index ce46855384..aef02f427a 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
@@ -130,11 +130,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        XiModel(const XiModel&);
+        //- No copy construct
+        XiModel(const XiModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const XiModel&);
+        //- No copy assignment
+        void operator=(const XiModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
index ea954677f3..9c3e243992 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
@@ -67,11 +67,11 @@ class algebraic
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        algebraic(const algebraic&);
+        //- No copy construct
+        algebraic(const algebraic&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const algebraic&);
+        //- No copy assignment
+        void operator=(const algebraic&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
index d2bca735c0..42b26a3558 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
@@ -55,11 +55,11 @@ class fixed
 {
     // Private Member Functions
 
-        //- Disallow copy construct
-        fixed(const fixed&);
+        //- No copy construct
+        fixed(const fixed&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fixed&);
+        //- No copy assignment
+        void operator=(const fixed&) = delete;
 
 
 public:
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
index 698b171462..29cb41487f 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
@@ -67,11 +67,11 @@ class transport
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        transport(const transport&);
+        //- No copy construct
+        transport(const transport&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const transport&);
+        //- No copy assignment
+        void operator=(const transport&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.H
index f521672bb7..cf69c5f91b 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.H
@@ -56,11 +56,11 @@ class VoFPatchTransfer
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        VoFPatchTransfer(const VoFPatchTransfer&);
+        //- No copy construct
+        VoFPatchTransfer(const VoFPatchTransfer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const VoFPatchTransfer&);
+        //- No copy assignment
+        void operator=(const VoFPatchTransfer&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
index 2749528e59..9b20642038 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
@@ -135,11 +135,14 @@ class VoFSolidificationMeltingSource
         template<class RhoFieldType>
         void apply(const RhoFieldType& rho, fvMatrix<scalar>& eqn);
 
-        //- Disallow default bitwise copy construct
-        VoFSolidificationMeltingSource(const VoFSolidificationMeltingSource&);
+        //- No copy construct
+        VoFSolidificationMeltingSource
+        (
+            const VoFSolidificationMeltingSource&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const VoFSolidificationMeltingSource&);
+        //- No copy assignment
+        void operator=(const VoFSolidificationMeltingSource&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModel.H b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModel.H
index a3de318510..208088c86e 100644
--- a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModel.H
+++ b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModel.H
@@ -73,11 +73,11 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        mixtureViscosityModel(const mixtureViscosityModel&);
+        //- No copy construct
+        mixtureViscosityModel(const mixtureViscosityModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const mixtureViscosityModel&);
+        //- No copy assignment
+        void operator=(const mixtureViscosityModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H
index 420a7c3e8a..cf72616502 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H
@@ -55,11 +55,11 @@ class relativeVelocityModel
         //- Return the list of patchFieldTypes for Udm derived from U
         wordList UdmPatchFieldTypes() const;
 
-        //- Disallow default bitwise copy construct
-        relativeVelocityModel(const relativeVelocityModel&);
+        //- No copy construct
+        relativeVelocityModel(const relativeVelocityModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const relativeVelocityModel&);
+        //- No copy assignment
+        void operator=(const relativeVelocityModel&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H
index 9d748fd737..719497c6a1 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H
@@ -68,14 +68,14 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         temperaturePhaseChangeTwoPhaseMixture
         (
             const temperaturePhaseChangeTwoPhaseMixture&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const temperaturePhaseChangeTwoPhaseMixture&);
+        //- No copy assignment
+        void operator=(const temperaturePhaseChangeTwoPhaseMixture&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
index 482a8a1a8e..52735dfacc 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
@@ -73,9 +73,15 @@ class threePhaseInterfaceProperties
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        threePhaseInterfaceProperties(const threePhaseInterfaceProperties&);
-        void operator=(const threePhaseInterfaceProperties&);
+        //- No copy construct
+        threePhaseInterfaceProperties
+        (
+            const threePhaseInterfaceProperties&
+        ) = delete;
+
+        //- No copy assignment
+        void operator=(const threePhaseInterfaceProperties&) = delete;
+
 
         //- Correction for the boundary condition on the unit normal nHat on
         //  walls to produce the correct contact dynamic angle.
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
index dedc97a9e9..010d2abc7b 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
@@ -69,11 +69,11 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        phaseChangeTwoPhaseMixture(const phaseChangeTwoPhaseMixture&);
+        //- No copy construct
+        phaseChangeTwoPhaseMixture(const phaseChangeTwoPhaseMixture&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const phaseChangeTwoPhaseMixture&);
+        //- No copy assignment
+        void operator=(const phaseChangeTwoPhaseMixture&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H
index 8b76f13c56..b6accd4197 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H
@@ -52,11 +52,11 @@ class saturationModel
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        saturationModel(const saturationModel&);
+        //- No copy construct
+        saturationModel(const saturationModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const saturationModel&);
+        //- No copy assignment
+        void operator=(const saturationModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H
index 8f23f6881e..9378d96512 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H
@@ -58,11 +58,11 @@ class wallDependentModel
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        wallDependentModel(const wallDependentModel&);
+        //- No copy construct
+        wallDependentModel(const wallDependentModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const wallDependentModel&);
+        //- No copy assignment
+        void operator=(const wallDependentModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
index c51599d58c..6e40333006 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
@@ -78,11 +78,14 @@ class BlendedInterfacialModel
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        BlendedInterfacialModel(const BlendedInterfacialModel<ModelType>&);
+        //- No copy construct
+        BlendedInterfacialModel
+        (
+            const BlendedInterfacialModel&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const BlendedInterfacialModel<ModelType>&);
+        //- No copy assignment
+        void operator=(const BlendedInterfacialModel<ModelType>&) = delete;
 
         //- Correct coeff/value on fixed flux boundary conditions
         template<class GeometricField>
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H
index 5a7375e061..f4e6f1bf9b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H
@@ -57,11 +57,11 @@ class departureDiameterModel
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        departureDiameterModel(const departureDiameterModel&);
+        //- No copy construct
+        departureDiameterModel(const departureDiameterModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const departureDiameterModel&);
+        //- No copy assignment
+        void operator=(const departureDiameterModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H
index 282df0b123..8ea72dc63a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H
@@ -57,11 +57,11 @@ class departureFrequencyModel
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        departureFrequencyModel(const departureFrequencyModel&);
+        //- No copy construct
+        departureFrequencyModel(const departureFrequencyModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const departureFrequencyModel&);
+        //- No copy assignment
+        void operator=(const departureFrequencyModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H
index fc26b7f9ec..b68e500728 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H
@@ -57,11 +57,11 @@ class nucleationSiteModel
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        nucleationSiteModel(const nucleationSiteModel&);
+        //- No copy construct
+        nucleationSiteModel(const nucleationSiteModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const nucleationSiteModel&);
+        //- No copy assignment
+        void operator=(const nucleationSiteModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H
index c9f635624f..428b2183bd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H
@@ -55,11 +55,11 @@ class partitioningModel
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        partitioningModel(const partitioningModel&);
+        //- No copy construct
+        partitioningModel(const partitioningModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const partitioningModel&);
+        //- No copy assignment
+        void operator=(const partitioningModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
index 6e44f6457a..76c5b5c1a1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
@@ -52,11 +52,11 @@ class conductivityModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        conductivityModel(const conductivityModel&);
+        //- No copy construct
+        conductivityModel(const conductivityModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const conductivityModel&);
+        //- No copy assignment
+        void operator=(const conductivityModel&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index 20feced234..bb554aa5df 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -53,11 +53,11 @@ class frictionalStressModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        frictionalStressModel(const frictionalStressModel&);
+        //- No copy construct
+        frictionalStressModel(const frictionalStressModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const frictionalStressModel&);
+        //- No copy assignment
+        void operator=(const frictionalStressModel&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
index 06160f6c0a..bf4acfd01e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
@@ -52,11 +52,11 @@ class granularPressureModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        granularPressureModel(const granularPressureModel&);
+        //- No copy construct
+        granularPressureModel(const granularPressureModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const granularPressureModel&);
+        //- No copy assignment
+        void operator=(const granularPressureModel&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index 03f323e519..f382ac2d91 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -147,11 +147,11 @@ class kineticTheoryModel
         void correctNut()
         {}
 
-        //- Disallow default bitwise copy construct
-        kineticTheoryModel(const kineticTheoryModel&);
+        //- No copy construct
+        kineticTheoryModel(const kineticTheoryModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const kineticTheoryModel&);
+        //- No copy assignment
+        void operator=(const kineticTheoryModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
index de73a22747..12f4d919a2 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -52,11 +52,11 @@ class radialModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        radialModel(const radialModel&);
+        //- No copy construct
+        radialModel(const radialModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const radialModel&);
+        //- No copy assignment
+        void operator=(const radialModel&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
index e0bc93cc79..0f3404ea38 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
@@ -54,11 +54,11 @@ class viscosityModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        viscosityModel(const viscosityModel&);
+        //- No copy construct
+        viscosityModel(const viscosityModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const viscosityModel&);
+        //- No copy assignment
+        void operator=(const viscosityModel&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
index ab5e38effe..48957ebeb8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
@@ -102,11 +102,11 @@ class phasePressureModel
         void correctNut()
         {}
 
-        //- Disallow default bitwise copy construct
-        phasePressureModel(const phasePressureModel&);
+        //- No copy construct
+        phasePressureModel(const phasePressureModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const phasePressureModel&);
+        //- No copy assignment
+        void operator=(const phasePressureModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H
index 44ff901531..c33dac5682 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H
@@ -58,11 +58,11 @@ class wallDependentModel
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        wallDependentModel(const wallDependentModel&);
+        //- No copy construct
+        wallDependentModel(const wallDependentModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const wallDependentModel&);
+        //- No copy assignment
+        void operator=(const wallDependentModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
index 6e44f6457a..76c5b5c1a1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
@@ -52,11 +52,11 @@ class conductivityModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        conductivityModel(const conductivityModel&);
+        //- No copy construct
+        conductivityModel(const conductivityModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const conductivityModel&);
+        //- No copy assignment
+        void operator=(const conductivityModel&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index 20feced234..bb554aa5df 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -53,11 +53,11 @@ class frictionalStressModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        frictionalStressModel(const frictionalStressModel&);
+        //- No copy construct
+        frictionalStressModel(const frictionalStressModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const frictionalStressModel&);
+        //- No copy assignment
+        void operator=(const frictionalStressModel&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
index 06160f6c0a..bf4acfd01e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
@@ -52,11 +52,11 @@ class granularPressureModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        granularPressureModel(const granularPressureModel&);
+        //- No copy construct
+        granularPressureModel(const granularPressureModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const granularPressureModel&);
+        //- No copy assignment
+        void operator=(const granularPressureModel&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index 03f323e519..f382ac2d91 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -147,11 +147,11 @@ class kineticTheoryModel
         void correctNut()
         {}
 
-        //- Disallow default bitwise copy construct
-        kineticTheoryModel(const kineticTheoryModel&);
+        //- No copy construct
+        kineticTheoryModel(const kineticTheoryModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const kineticTheoryModel&);
+        //- No copy assignment
+        void operator=(const kineticTheoryModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
index de73a22747..12f4d919a2 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -52,11 +52,11 @@ class radialModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        radialModel(const radialModel&);
+        //- No copy construct
+        radialModel(const radialModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const radialModel&);
+        //- No copy assignment
+        void operator=(const radialModel&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
index e0bc93cc79..0f3404ea38 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
@@ -54,11 +54,11 @@ class viscosityModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        viscosityModel(const viscosityModel&);
+        //- No copy construct
+        viscosityModel(const viscosityModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const viscosityModel&);
+        //- No copy assignment
+        void operator=(const viscosityModel&) = delete;
 
 
 protected:
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
index c148e3c40a..f927e6194a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
@@ -106,11 +106,11 @@ class phasePressureModel
         void correctNut()
         {}
 
-        //- Disallow default bitwise copy construct
-        phasePressureModel(const phasePressureModel&);
+        //- No copy construct
+        phasePressureModel(const phasePressureModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const phasePressureModel&);
+        //- No copy assignment
+        void operator=(const phasePressureModel&) = delete;
 
 
 public:
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H
index c53894f45c..c997d06387 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H
@@ -81,11 +81,14 @@ class BlendedInterfacialModel
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        BlendedInterfacialModel(const BlendedInterfacialModel<modelType>&);
+        //- No copy construct
+        BlendedInterfacialModel
+        (
+            const BlendedInterfacialModel&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const BlendedInterfacialModel<modelType>&);
+        //- No copy assignment
+        void operator=(const BlendedInterfacialModel<modelType>&) = delete;
 
         //- Correct coeff/value on fixed flux boundary conditions
         template<class GeometricField>
diff --git a/applications/test/dictionaryTokens/dictionaryTokens.H b/applications/test/dictionaryTokens/dictionaryTokens.H
index f686633567..0fe43a515f 100644
--- a/applications/test/dictionaryTokens/dictionaryTokens.H
+++ b/applications/test/dictionaryTokens/dictionaryTokens.H
@@ -113,8 +113,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow bitwise copy/assignment
+        //- No copy construct
         dictionaryTokens(const dictionaryTokens&) = delete;
+
+        //- No copy assignment
         void operator=(const dictionaryTokens&) = delete;
 
 
@@ -181,8 +183,10 @@ class dictionaryTokens::primitive_iterator
 
     // Private Member Functions
 
-        //- Disallow bitwise copy/assignment
+        //- No copy construct
         primitive_iterator(const primitive_iterator&) = delete;
+
+        //- No copy assignment
         void operator=(const primitive_iterator&) = delete;
 
 public:
@@ -251,8 +255,10 @@ class dictionaryTokens::dictionary_iterator
 
     // Private Member Functions
 
-        //- Disallow bitwise copy/assignment
+        //- No copy construct
         dictionary_iterator(const dictionary_iterator&) = delete;
+
+        //- No copy assignment
         void operator=(const dictionary_iterator&) = delete;
 
 
diff --git a/applications/test/router/router.H b/applications/test/router/router.H
index cbddd9a35b..46a1bd111f 100644
--- a/applications/test/router/router.H
+++ b/applications/test/router/router.H
@@ -159,11 +159,11 @@ class router
             DynamicList<label>& route
         ) const;
 
-        //- Disallow default bitwise copy construct
-        router(const router&);
+        //- No copy construct
+        router(const router&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const router&);
+        //- No copy assignment
+        void operator=(const router&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
index cf7df6963b..29527a486f 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
+++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
@@ -91,11 +91,11 @@ class cellSplitter
             const Map<labelList>& cellToCells
         ) const;
 
-        //- Disallow default bitwise copy construct
-        cellSplitter(const cellSplitter&);
+        //- No copy construct
+        cellSplitter(const cellSplitter&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellSplitter&);
+        //- No copy assignment
+        void operator=(const cellSplitter&) = delete;
 
 public:
 
diff --git a/applications/utilities/mesh/advanced/selectCells/edgeStats.H b/applications/utilities/mesh/advanced/selectCells/edgeStats.H
index 00d20f1e63..fc0d001da8 100644
--- a/applications/utilities/mesh/advanced/selectCells/edgeStats.H
+++ b/applications/utilities/mesh/advanced/selectCells/edgeStats.H
@@ -68,11 +68,11 @@ class edgeStats
         direction getNormalDir(const twoDPointCorrector*) const;
 
 
-        //- Disallow default bitwise copy construct
-        edgeStats(const edgeStats&);
+        //- No copy construct
+        edgeStats(const edgeStats&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const edgeStats&);
+        //- No copy assignment
+        void operator=(const edgeStats&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H
index adec113adf..ddb9a8b0ba 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H
@@ -74,11 +74,11 @@ class hexBlock
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        hexBlock(const hexBlock&);
+        //- No copy construct
+        hexBlock(const hexBlock&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const hexBlock&);
+        //- No copy assignment
+        void operator=(const hexBlock&) = delete;
 
         //- Vertex addressing inside the block
         inline label vtxLabel(label i, label j, label k) const;
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H
index f7a1f82ee7..71f1ba0067 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H
@@ -67,11 +67,11 @@ class hexBlock
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        hexBlock(const hexBlock&);
+        //- No copy construct
+        hexBlock(const hexBlock&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const hexBlock&);
+        //- No copy assignment
+        void operator=(const hexBlock&) = delete;
 
         //- Vertex addressing inside the block
         inline label vtxLabel(label i, label j, label k) const;
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H
index 39f2d42cb9..5f27cea07f 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H
@@ -86,10 +86,10 @@ class extrudedMesh
         );
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         extrudedMesh(const extrudedMesh&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const extrudedMesh&) = delete;
 
 
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
index 99d69412c9..7036549c26 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
@@ -87,11 +87,11 @@ class extrude2DMesh
         //- Find extrusion direction
         //void findExtrudeDirection();
 
-        //- Disallow default bitwise copy construct
-        extrude2DMesh(const extrude2DMesh&);
+        //- No copy construct
+        extrude2DMesh(const extrude2DMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const extrude2DMesh&);
+        //- No copy assignment
+        void operator=(const extrude2DMesh&) = delete;
 
 public:
 
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H
index 05ee887397..1c94cf1b0a 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H
@@ -85,11 +85,11 @@ class patchToPoly2DMesh
 
         void createPolyMeshComponents();
 
-        //- Disallow default bitwise copy construct
-        patchToPoly2DMesh(const patchToPoly2DMesh&);
+        //- No copy construct
+        patchToPoly2DMesh(const patchToPoly2DMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const patchToPoly2DMesh&);
+        //- No copy assignment
+        void operator=(const patchToPoly2DMesh&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H
index 24de053055..db77984acf 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H
@@ -70,11 +70,11 @@ class cv2DControls
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cv2DControls(const cv2DControls&);
+        //- No copy construct
+        cv2DControls(const cv2DControls&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cv2DControls&);
+        //- No copy assignment
+        void operator=(const cv2DControls&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
index 7c92f8acff..3eae606102 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
@@ -142,11 +142,11 @@ private:
             const List<DynamicList<label>>& patchOwners
         ) const;
 
-        //- Disallow default bitwise copy construct
-        DelaunayMesh(const DelaunayMesh<Triangulation>&);
+        //- No copy construct
+        DelaunayMesh(const DelaunayMesh<Triangulation>&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const DelaunayMesh<Triangulation>&);
+        //- No copy assignment
+        void operator=(const DelaunayMesh<Triangulation>&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
index 07954827b8..605e403ac0 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
@@ -119,11 +119,14 @@ private:
             labelPairHashSet& receivedVertices
         );
 
-        //- Disallow default bitwise copy construct
-        DistributedDelaunayMesh(const DistributedDelaunayMesh<Triangulation>&);
+        //- No copy construct
+        DistributedDelaunayMesh
+        (
+            const DistributedDelaunayMesh&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const DistributedDelaunayMesh<Triangulation>&);
+        //- No copy assignment
+        void operator=(const DistributedDelaunayMesh<Triangulation>&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
index 7be15695bc..11bcd4d352 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
@@ -193,22 +193,4 @@ void Foam::PrintTable<KeyType, DataType>::print
 }
 
 
-// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
-
-template<class KeyType, class DataType>
-void Foam::PrintTable<KeyType, DataType>::operator=
-(
-    const PrintTable<KeyType, DataType>& rhs
-)
-{
-    // Check for assignment to self
-    if (this == &rhs)
-    {
-        FatalErrorInFunction
-            << "Attempted assignment to self"
-            << abort(FatalError);
-    }
-}
-
-
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.H
index 175d2908d5..ce51a650ff 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.H
@@ -82,8 +82,8 @@ class PrintTable
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const PrintTable<KeyType, DataType>&);
+        //- No copy assignment
+        void operator=(const PrintTable<KeyType, DataType>&) = delete;
 
 
 public:
@@ -107,7 +107,7 @@ public:
     // Member Functions
 
         //- Add an entry (D) to the given key(K)
-        void add(const KeyType& K, const DataType& D);
+        inline void add(const KeyType& K, const DataType& D);
 
         //- Print the table
         void print
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H
index 77f40bc247..62bb0f1166 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H
@@ -26,7 +26,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class KeyType, class DataType>
-void Foam::PrintTable<KeyType, DataType>::add
+inline void Foam::PrintTable<KeyType, DataType>::add
 (
     const KeyType& K,
     const DataType& D
@@ -35,8 +35,4 @@ void Foam::PrintTable<KeyType, DataType>::add
     table_.set(K, D);
 }
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index 864822e088..d518bdf4c6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -177,11 +177,14 @@ class backgroundMeshDecomposition
         //- Build the surface patch and search tree
         void buildPatchAndTree();
 
-        //- Disallow default bitwise copy construct
-        backgroundMeshDecomposition(const backgroundMeshDecomposition&);
+        //- No copy construct
+        backgroundMeshDecomposition
+        (
+            const backgroundMeshDecomposition&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const backgroundMeshDecomposition&);
+        //- No copy assignment
+        void operator=(const backgroundMeshDecomposition&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H
index 0d1c318004..80d5bd98f0 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H
@@ -61,11 +61,11 @@ class cellAspectRatioControl
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellAspectRatioControl(const cellAspectRatioControl&);
+        //- No copy construct
+        cellAspectRatioControl(const cellAspectRatioControl&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellAspectRatioControl&);
+        //- No copy assignment
+        void operator=(const cellAspectRatioControl&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H
index 44a6557d52..78888d92f3 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H
@@ -85,11 +85,11 @@ class cellShapeControl
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellShapeControl(const cellShapeControl&);
+        //- No copy construct
+        cellShapeControl(const cellShapeControl&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellShapeControl&);
+        //- No copy assignment
+        void operator=(const cellShapeControl&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H
index 507809ce76..adcc0333f1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H
@@ -83,11 +83,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellShapeControlMesh(const cellShapeControlMesh&);
+        //- No copy construct
+        cellShapeControlMesh(const cellShapeControlMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellShapeControlMesh&);
+        //- No copy assignment
+        void operator=(const cellShapeControlMesh&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H
index adda0867a1..6d04854921 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H
@@ -71,11 +71,14 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellSizeAndAlignmentControl(const cellSizeAndAlignmentControl&);
+        //- No copy construct
+        cellSizeAndAlignmentControl
+        (
+            const cellSizeAndAlignmentControl&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellSizeAndAlignmentControl&);
+        //- No copy assignment
+        void operator=(const cellSizeAndAlignmentControl&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H
index 14221dc70a..e01d10e2d8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H
@@ -68,11 +68,14 @@ class cellSizeAndAlignmentControls
             label& maxPriority
         ) const;
 
-        //- Disallow default bitwise copy construct
-        cellSizeAndAlignmentControls(const cellSizeAndAlignmentControls&);
+        //- No copy construct
+        cellSizeAndAlignmentControls
+        (
+            const cellSizeAndAlignmentControls&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellSizeAndAlignmentControls&);
+        //- No copy assignment
+        void operator=(const cellSizeAndAlignmentControls&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H
index 4fab414db6..6bf8de4fa7 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H
@@ -63,11 +63,11 @@ class fileControl
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fileControl(const fileControl&);
+        //- No copy construct
+        fileControl(const fileControl&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fileControl&);
+        //- No copy assignment
+        void operator=(const fileControl&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H
index 27aecc90f0..9933057a81 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H
@@ -88,11 +88,11 @@ class searchableSurfaceControl
 //            const vectorField& ptNormals
 //        ) const;
 
-        //- Disallow default bitwise copy construct
-        searchableSurfaceControl(const searchableSurfaceControl&);
+        //- No copy construct
+        searchableSurfaceControl(const searchableSurfaceControl&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableSurfaceControl&);
+        //- No copy assignment
+        void operator=(const searchableSurfaceControl&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H
index 5f34fd5637..2b0d5f268f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H
@@ -99,11 +99,11 @@ class controlMeshRefinement
 
         pointHit findDiscontinuities(const linePointRef& l) const;
 
-        //- Disallow default bitwise copy construct
-        controlMeshRefinement(const controlMeshRefinement&);
+        //- No copy construct
+        controlMeshRefinement(const controlMeshRefinement&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const controlMeshRefinement&);
+        //- No copy assignment
+        void operator=(const controlMeshRefinement&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
index 19cc6ea665..1d8fe85403 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
@@ -91,11 +91,11 @@ class smoothAlignmentSolver
             triad& t
         ) const;
 
-        //- Disallow default bitwise copy construct
-        smoothAlignmentSolver(const smoothAlignmentSolver&);
+        //- No copy construct
+        smoothAlignmentSolver(const smoothAlignmentSolver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const smoothAlignmentSolver&);
+        //- No copy assignment
+        void operator=(const smoothAlignmentSolver&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
index a6d802523b..095021d0a0 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
@@ -110,11 +110,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellSizeFunction(const cellSizeFunction&);
+        //- No copy construct
+        cellSizeFunction(const cellSizeFunction&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellSizeFunction&);
+        //- No copy assignment
+        void operator=(const cellSizeFunction&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H
index 2db1163d9f..f645e8a786 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H
@@ -67,11 +67,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellSizeCalculationType(const cellSizeCalculationType&);
+        //- No copy construct
+        cellSizeCalculationType(const cellSizeCalculationType&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellSizeCalculationType&);
+        //- No copy assignment
+        void operator=(const cellSizeCalculationType&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H
index 2f51cecb88..27f88db21c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H
@@ -75,11 +75,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        surfaceCellSizeFunction(const surfaceCellSizeFunction&);
+        //- No copy construct
+        surfaceCellSizeFunction(const surfaceCellSizeFunction&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const surfaceCellSizeFunction&);
+        //- No copy assignment
+        void operator=(const surfaceCellSizeFunction&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 497d64796b..25c32eafe1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -850,11 +850,11 @@ private:
 
         void writePointPairs(const fileName& fName) const;
 
-        //- Disallow default bitwise copy construct
-        conformalVoronoiMesh(const conformalVoronoiMesh&);
+        //- No copy construct
+        conformalVoronoiMesh(const conformalVoronoiMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const conformalVoronoiMesh&);
+        //- No copy assignment
+        void operator=(const conformalVoronoiMesh&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
index 249c8d8cba..78edf6ee38 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
@@ -133,11 +133,11 @@ class featurePointConformer
         //- Create the points that will conform to the feature
         void createFeaturePoints(DynamicList<Vb>& pts);
 
-        //- Disallow default bitwise copy construct
-        featurePointConformer(const featurePointConformer&);
+        //- No copy construct
+        featurePointConformer(const featurePointConformer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const featurePointConformer&);
+        //- No copy assignment
+        void operator=(const featurePointConformer&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
index 09c351bd0a..f2bf237fb9 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
@@ -125,11 +125,11 @@ class conformationSurfaces
             label& featureIndex
         );
 
-        //- Disallow default bitwise copy construct
-        conformationSurfaces(const conformationSurfaces&);
+        //- No copy construct
+        conformationSurfaces(const conformationSurfaces&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const conformationSurfaces&);
+        //- No copy assignment
+        void operator=(const conformationSurfaces&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.H
index 8d86f75680..97a87a3c5f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.H
@@ -209,11 +209,11 @@ class cvControls
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cvControls(const cvControls&);
+        //- No copy construct
+        cvControls(const cvControls&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cvControls&);
+        //- No copy assignment
+        void operator=(const cvControls&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
index acf3b95dcf..ab98f27599 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
@@ -68,11 +68,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faceAreaWeightModel(const faceAreaWeightModel&);
+        //- No copy construct
+        faceAreaWeightModel(const faceAreaWeightModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faceAreaWeightModel&);
+        //- No copy assignment
+        void operator=(const faceAreaWeightModel&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
index 5c7a940996..a7c4074372 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
@@ -87,11 +87,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        initialPointsMethod(const initialPointsMethod&);
+        //- No copy construct
+        initialPointsMethod(const initialPointsMethod&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const initialPointsMethod&);
+        //- No copy assignment
+        void operator=(const initialPointsMethod&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
index f083bab0b8..364427a0e9 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
@@ -70,11 +70,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        relaxationModel(const relaxationModel&);
+        //- No copy construct
+        relaxationModel(const relaxationModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const relaxationModel&);
+        //- No copy assignment
+        void operator=(const relaxationModel&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.H
index fde23719f7..f4accf0302 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.H
@@ -59,11 +59,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        searchableBoxFeatures(const searchableBoxFeatures&);
+        //- No copy construct
+        searchableBoxFeatures(const searchableBoxFeatures&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableBoxFeatures&);
+        //- No copy assignment
+        void operator=(const searchableBoxFeatures&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchablePlateFeatures.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchablePlateFeatures.H
index 46c33e4c4e..d89199ebfd 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchablePlateFeatures.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchablePlateFeatures.H
@@ -63,11 +63,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        searchablePlateFeatures(const searchablePlateFeatures&);
+        //- No copy construct
+        searchablePlateFeatures(const searchablePlateFeatures&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchablePlateFeatures&);
+        //- No copy assignment
+        void operator=(const searchablePlateFeatures&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H
index f42e974f0a..8627f8c489 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H
@@ -60,11 +60,11 @@ class searchableSurfaceFeatures
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        searchableSurfaceFeatures(const searchableSurfaceFeatures&);
+        //- No copy construct
+        searchableSurfaceFeatures(const searchableSurfaceFeatures&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableSurfaceFeatures&);
+        //- No copy assignment
+        void operator=(const searchableSurfaceFeatures&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/triSurfaceMeshFeatures.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/triSurfaceMeshFeatures.H
index 3a743e3be1..f728d973a4 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/triSurfaceMeshFeatures.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/triSurfaceMeshFeatures.H
@@ -61,11 +61,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        triSurfaceMeshFeatures(const triSurfaceMeshFeatures&);
+        //- No copy construct
+        triSurfaceMeshFeatures(const triSurfaceMeshFeatures&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const triSurfaceMeshFeatures&);
+        //- No copy assignment
+        void operator=(const triSurfaceMeshFeatures&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H
index 88569485c9..c0e0e48987 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H
@@ -199,11 +199,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        CV2D(const CV2D&);
+        //- No copy construct
+        CV2D(const CV2D&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const CV2D&);
+        //- No copy assignment
+        void operator=(const CV2D&) = delete;
 
 
         //- Insert point and return it's index
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H
index 66f055a377..ccea783ccf 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H
@@ -90,11 +90,11 @@ class shortEdgeFilter2D
             labelList& patchSizes
         ) const;
 
-        //- Disallow default bitwise copy construct
-        shortEdgeFilter2D(const shortEdgeFilter2D&);
+        //- No copy construct
+        shortEdgeFilter2D(const shortEdgeFilter2D&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const shortEdgeFilter2D&);
+        //- No copy assignment
+        void operator=(const shortEdgeFilter2D&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
index 94a934b22b..b0696f80aa 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
@@ -76,10 +76,10 @@ class mergePolyMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         mergePolyMesh(const mergePolyMesh&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const mergePolyMesh&) = delete;
 
 
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
index 99794622ad..10ab1d9389 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
@@ -60,10 +60,10 @@ class mirrorFvMesh
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         mirrorFvMesh(const mirrorFvMesh&) = delete;
 
-        //- Disallow copy assignment
+        //- No copy assignment
         void operator=(const mirrorFvMesh&) = delete;
 
 
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
index ce631f4ad0..6534a834c9 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
@@ -168,11 +168,11 @@ class meshDualiser
             boolList& donePFaces            // pFaces visited
         ) const;
 
-        //- Disallow default bitwise copy construct
-        meshDualiser(const meshDualiser&);
+        //- No copy construct
+        meshDualiser(const meshDualiser&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const meshDualiser&);
+        //- No copy assignment
+        void operator=(const meshDualiser&) = delete;
 
 
 public:
diff --git a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H
index ee4fc1d777..a7d8858f17 100644
--- a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H
@@ -71,11 +71,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        dimFieldDecomposer(const dimFieldDecomposer&);
+        //- No copy construct
+        dimFieldDecomposer(const dimFieldDecomposer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dimFieldDecomposer&);
+        //- No copy assignment
+        void operator=(const dimFieldDecomposer&) = delete;
 
 
 public:
diff --git a/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.H
index 08f9b4a385..c426be343e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.H
@@ -252,11 +252,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faFieldDecomposer(const faFieldDecomposer&);
+        //- No copy construct
+        faFieldDecomposer(const faFieldDecomposer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faFieldDecomposer&);
+        //- No copy assignment
+        void operator=(const faFieldDecomposer&) = delete;
 
 
 public:
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
index aca0672296..5506e51cc2 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
@@ -68,11 +68,11 @@ class lagrangianFieldDecomposer
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        lagrangianFieldDecomposer(const lagrangianFieldDecomposer&);
+        //- No copy construct
+        lagrangianFieldDecomposer(const lagrangianFieldDecomposer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const lagrangianFieldDecomposer&);
+        //- No copy assignment
+        void operator=(const lagrangianFieldDecomposer&) = delete;
 
 
 public:
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
index d912ca8d9f..a5ddfdb583 100644
--- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
@@ -125,11 +125,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointFieldDecomposer(const pointFieldDecomposer&);
+        //- No copy construct
+        pointFieldDecomposer(const pointFieldDecomposer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointFieldDecomposer&);
+        //- No copy assignment
+        void operator=(const pointFieldDecomposer&) = delete;
 
 
 public:
diff --git a/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.H b/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.H
index 3b15fc31e9..d7a4c42e78 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.H
+++ b/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.H
@@ -80,11 +80,11 @@ class faFieldReconstructor
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faFieldReconstructor(const faFieldReconstructor&);
+        //- No copy construct
+        faFieldReconstructor(const faFieldReconstructor&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faFieldReconstructor&);
+        //- No copy assignment
+        void operator=(const faFieldReconstructor&) = delete;
 
 
 public:
diff --git a/applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.H b/applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.H
index dd179adaa2..8d82d3505b 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.H
+++ b/applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.H
@@ -84,11 +84,11 @@ class processorFaMeshes
         //- Read all meshes
         void read();
 
-        //- Disallow default bitwise copy construct
-        processorFaMeshes(const processorFaMeshes&);
+        //- No copy construct
+        processorFaMeshes(const processorFaMeshes&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const processorFaMeshes&);
+        //- No copy assignment
+        void operator=(const processorFaMeshes&) = delete;
 
 
 public:
diff --git a/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H
index 9c0d0617b9..88d84d41e7 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H
+++ b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H
@@ -80,11 +80,11 @@ class parFvFieldReconstructor
         //- Construct per-patch addressing
         void createPatchFaceMaps();
 
-        //- Disallow default bitwise copy construct
-        parFvFieldReconstructor(const parFvFieldReconstructor&);
+        //- No copy construct
+        parFvFieldReconstructor(const parFvFieldReconstructor&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const parFvFieldReconstructor&);
+        //- No copy assignment
+        void operator=(const parFvFieldReconstructor&) = delete;
 
 
 public:
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.H b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.H
index 3dc1e85ce0..b8e05c1b12 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.H
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.H
@@ -77,11 +77,11 @@ class parLagrangianRedistributor
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        parLagrangianRedistributor(const parLagrangianRedistributor&);
+        //- No copy construct
+        parLagrangianRedistributor(const parLagrangianRedistributor&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const parLagrangianRedistributor&);
+        //- No copy assignment
+        void operator=(const parLagrangianRedistributor&) = delete;
 
 
 public:
diff --git a/applications/utilities/parallelProcessing/redistributePar/passivePositionParticleCloud.H b/applications/utilities/parallelProcessing/redistributePar/passivePositionParticleCloud.H
index f9a91d0f42..388e6b19dd 100644
--- a/applications/utilities/parallelProcessing/redistributePar/passivePositionParticleCloud.H
+++ b/applications/utilities/parallelProcessing/redistributePar/passivePositionParticleCloud.H
@@ -53,11 +53,14 @@ class passivePositionParticleCloud
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        passivePositionParticleCloud(const passivePositionParticleCloud&);
+        //- No copy construct
+        passivePositionParticleCloud
+        (
+            const passivePositionParticleCloud&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const passivePositionParticleCloud&);
+        //- No copy assignment
+        void operator=(const passivePositionParticleCloud&) = delete;
 
 
 public:
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
index bbfbb6e4db..05a9aeb8f7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
@@ -92,10 +92,10 @@ class lagrangianWriter
         void writeVerts();
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         lagrangianWriter(const lagrangianWriter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const lagrangianWriter&) = delete;
 
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/pqFoamReaderControls.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/pqFoamReaderControls.h
index ba0a7a9f67..1aa1cce617 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/pqFoamReaderControls.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/pqFoamReaderControls.h
@@ -82,10 +82,10 @@ class pqFoamReaderControls
     void fireCommand(vtkSMIntVectorProperty* prop, int val);
 
 
-    //- Disallow default bitwise copy construct
+    //- No copy construct
     pqFoamReaderControls(const pqFoamReaderControls&) = delete;
 
-    //- Disallow default bitwise assignment
+    //- No copy assignment
     void operator=(const pqFoamReaderControls&) = delete;
 
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.h
index 1b1f4f3962..948532bc3a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.h
@@ -222,10 +222,10 @@ protected:
 
 private:
 
-    //- Disallow default bitwise copy construct
+    //- No copy construct
     vtkPVFoamReader(const vtkPVFoamReader&) = delete;
 
-    //- Disallow default bitwise assignment
+    //- No copy assignment
     void operator=(const vtkPVFoamReader&) = delete;
 
     //- Add/remove patch names to/from the view
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/pqFoamBlockMeshControls.h b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/pqFoamBlockMeshControls.h
index 89d7e945db..edb94585c3 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/pqFoamBlockMeshControls.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/pqFoamBlockMeshControls.h
@@ -78,10 +78,10 @@ class pqFoamBlockMeshControls
     void updateParts();
 
 
-    //- Disallow default bitwise copy construct
+    //- No copy construct
     pqFoamBlockMeshControls(const pqFoamBlockMeshControls&) = delete;
 
-    //- Disallow default bitwise assignment
+    //- No copy assignment
     void operator=(const pqFoamBlockMeshControls&) = delete;
 
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMeshReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMeshReader.h
index f881d3c4ed..c3d4534ede 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMeshReader.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMeshReader.h
@@ -148,10 +148,10 @@ protected:
 
 private:
 
-    //- Disallow default bitwise copy construct
+    //- No copy construct
     vtkPVblockMeshReader(const vtkPVblockMeshReader&) = delete;
 
-    //- Disallow default bitwise assignment
+    //- No copy assignment
     void operator=(const vtkPVblockMeshReader&) = delete;
 
     //- Add/remove patch names to/from the view
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.H
index 1a85c65529..146370ae03 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.H
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.H
@@ -141,10 +141,10 @@ class vtkPVblockMesh
         void convertMeshCorners(vtkMultiBlockDataSet*, int& blockNo);
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         vtkPVblockMesh(const vtkPVblockMesh&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const vtkPVblockMesh&) = delete;
 
 
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H
index 36e7764c4d..1c8aafe4ab 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H
@@ -93,9 +93,11 @@ class channelIndex
             const labelList& startFaces
         );
 
-        //- Disallow default bitwise copy construct and assignment
-        channelIndex(const channelIndex&);
-        void operator=(const channelIndex&);
+        //- No copy construct
+        channelIndex(const channelIndex&) = delete;
+
+        //- No copy assignment
+        void operator=(const channelIndex&) = delete;
 
 
 public:
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H
index bf1abc1e2a..feb30b0d0c 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H
@@ -67,11 +67,11 @@ class PolyhedronReader
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PolyhedronReader(const PolyhedronReader&);
+        //- No copy construct
+        PolyhedronReader(const PolyhedronReader&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PolyhedronReader&);
+        //- No copy assignment
+        void operator=(const PolyhedronReader&) = delete;
 
 
 public:
diff --git a/src/ODE/ODESolvers/ODESolver/ODESolver.H b/src/ODE/ODESolvers/ODESolver/ODESolver.H
index d016c26cd1..42ce0d9f5a 100644
--- a/src/ODE/ODESolvers/ODESolver/ODESolver.H
+++ b/src/ODE/ODESolvers/ODESolver/ODESolver.H
@@ -87,11 +87,11 @@ protected:
             const scalarField& err
         ) const;
 
-        //- Disallow default bitwise copy construct
-        ODESolver(const ODESolver&);
+        //- No copy construct
+        ODESolver(const ODESolver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const ODESolver&);
+        //- No copy assignment
+        void operator=(const ODESolver&) = delete;
 
 
 public:
diff --git a/src/OSspecific/POSIX/cpuInfo/cpuInfo.H b/src/OSspecific/POSIX/cpuInfo/cpuInfo.H
index 27d7364f90..444ce72ffd 100644
--- a/src/OSspecific/POSIX/cpuInfo/cpuInfo.H
+++ b/src/OSspecific/POSIX/cpuInfo/cpuInfo.H
@@ -75,12 +75,12 @@ class cpuInfo
         //- Parse /proc/cpuinfo
         void parse();
 
-        //- Disallow default bitwise assignment
-        void operator=(const cpuInfo&) = delete;
-
-        //- Disallow default copy constructor
+        //- No copy construct
         cpuInfo(const cpuInfo&) = delete;
 
+        //- No copy assignment
+        void operator=(const cpuInfo&) = delete;
+
 public:
 
     // Constructors
diff --git a/src/OSspecific/POSIX/endian.H b/src/OSspecific/POSIX/endian.H
index 6edff65e88..cce070c197 100644
--- a/src/OSspecific/POSIX/endian.H
+++ b/src/OSspecific/POSIX/endian.H
@@ -97,10 +97,10 @@ class endian
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         endian(const endian&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const endian&) = delete;
 
 public:
diff --git a/src/OSspecific/POSIX/fileMonitor.H b/src/OSspecific/POSIX/fileMonitor.H
index 6a9cc1245e..fc7c51586d 100644
--- a/src/OSspecific/POSIX/fileMonitor.H
+++ b/src/OSspecific/POSIX/fileMonitor.H
@@ -103,11 +103,11 @@ private:
         //- Update localState_ from any events.
         void checkFiles() const;
 
-        //- Disallow default bitwise copy construct
-        fileMonitor(const fileMonitor&);
+        //- No copy construct
+        fileMonitor(const fileMonitor&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fileMonitor&);
+        //- No copy assignment
+        void operator=(const fileMonitor&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/algorithms/subCycle/subCycle.H b/src/OpenFOAM/algorithms/subCycle/subCycle.H
index 692146f8c0..fed81fe9af 100644
--- a/src/OpenFOAM/algorithms/subCycle/subCycle.H
+++ b/src/OpenFOAM/algorithms/subCycle/subCycle.H
@@ -111,10 +111,10 @@ class subCycle
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         subCycle(const subCycle<GeometricField>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const subCycle<GeometricField>&) = delete;
 
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
index fcac9d9cf6..c538e147e2 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
@@ -96,10 +96,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         DLListBase(const DLListBase&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const DLListBase&) = delete;
 
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
index f74e29c504..7b364137ba 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
@@ -85,10 +85,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         SLListBase(const SLListBase&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const SLListBase&) = delete;
 
 
diff --git a/src/OpenFOAM/containers/Lists/Histogram/Histogram.H b/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
index 5b4b5a9b22..737e1b2cb0 100644
--- a/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
+++ b/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
@@ -66,11 +66,11 @@ class Histogram
 
         void count(const List& bins, const List& l);
 
-        //- Disallow default bitwise copy construct
-        Histogram(const Histogram&);
+        //- No copy construct
+        Histogram(const Histogram&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const Histogram&);
+        //- No copy assignment
+        void operator=(const Histogram&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index 042c2044d9..6cb2dc576e 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -61,10 +61,10 @@ class IndirectListAddressing
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         IndirectListAddressing(const IndirectListAddressing&) = delete;
 
-        //- Disallow copy assignment
+        //- No copy assignment
         void operator=(const IndirectListAddressing&) = delete;
 
 
@@ -105,10 +105,10 @@ class IndirectList
 {
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy assignment
         void operator=(const IndirectList<T>&) = delete;
 
-        //- Disallow copy assignment
+        //- No copy assignment from UIndirectList
         void operator=(const UIndirectList<T>&) = delete;
 
 
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index fba0a559e5..c7830f50eb 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -251,11 +251,7 @@ public:
             inline T& newElmt(const label i);
 
 
-        //- Disallow implicit shallowCopy
-        void shallowCopy(const UList<T>&) = delete;
-
-
-    // Member operators
+    // Member Operators
 
         //- Assignment to UList operator. Takes linear time
         void operator=(const UList<T>& a);
@@ -295,7 +291,7 @@ public:
         void operator=(SLList<T>&& lst);
 
 
-    // Istream operator
+    // Istream Operator
 
         //- Read List from Istream, discarding contents of existing List
         friend Istream& operator>> <T>
@@ -304,6 +300,11 @@ public:
             List<T>& L
         );
 
+
+    // Housekeeping
+
+        //- No shallowCopy permitted
+        void shallowCopy(const UList<T>&) = delete;
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 1189d6725a..7bba6587a4 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -89,7 +89,7 @@ class UList
 
     // Private Member Functions
 
-        //- Disallow default shallow-copy assignment
+        //- No copy assignment (shallow copy)
         //
         //  Assignment of UList<T> may need to be either shallow (copy pointer)
         //  or deep (copy elements) depending on context or the particular type
diff --git a/src/OpenFOAM/db/Callback/Callback.H b/src/OpenFOAM/db/Callback/Callback.H
index b68e13e1e6..bddb4ba965 100644
--- a/src/OpenFOAM/db/Callback/Callback.H
+++ b/src/OpenFOAM/db/Callback/Callback.H
@@ -61,8 +61,8 @@ class Callback
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const Callback<CallbackType>&);
+        //- No copy assignment
+        void operator=(const Callback<CallbackType>&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
index e2481e6473..b5786d3ff7 100644
--- a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
+++ b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
@@ -71,11 +71,11 @@ class CallbackRegistry
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        CallbackRegistry(const CallbackRegistry&);
+        //- No copy construct
+        CallbackRegistry(const CallbackRegistry&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const CallbackRegistry&);
+        //- No copy assignment
+        void operator=(const CallbackRegistry&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index ea72f84912..fed6fca24f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -323,9 +323,11 @@ public:
         {
             label comm_;
 
-            //- Disallow copy and assignment
-            communicator(const communicator&);
-            void operator=(const communicator&);
+            //- No copy construct
+            communicator(const communicator&) = delete;
+
+            //- No copy assignment
+            void operator=(const communicator&) = delete;
 
         public:
 
diff --git a/src/OpenFOAM/db/IOstreams/hashes/base64Layer.H b/src/OpenFOAM/db/IOstreams/hashes/base64Layer.H
index 4eaaf87e83..3456aa2e13 100644
--- a/src/OpenFOAM/db/IOstreams/hashes/base64Layer.H
+++ b/src/OpenFOAM/db/IOstreams/hashes/base64Layer.H
@@ -75,10 +75,10 @@ class base64Layer
         inline unsigned char encode2() const;
         inline unsigned char encode3() const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         base64Layer(const base64Layer&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const base64Layer&) = delete;
 
 
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 1cf8143719..48d5cde872 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -145,10 +145,10 @@ public:
     {
         bool empty_;
 
-        //- No default copy construct
+        //- No copy construct
         compound(const compound&) = delete;
 
-        //- No default assign operator
+        //- No copy assignment
         compound& operator=(const compound&) = delete;
 
     public:
diff --git a/src/OpenFOAM/db/Time/subLoopTime.H b/src/OpenFOAM/db/Time/subLoopTime.H
index c8deb680e8..ce56da1544 100644
--- a/src/OpenFOAM/db/Time/subLoopTime.H
+++ b/src/OpenFOAM/db/Time/subLoopTime.H
@@ -53,10 +53,10 @@ class subLoopTime
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         subLoopTime(const subLoopTime&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const subLoopTime&) = delete;
 
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
index 06976c789b..65b4f73c6d 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
+++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
@@ -67,7 +67,7 @@ class dictionaryEntry
 {
     // Private Member Functions
 
-        //- Disallow bitwise copy
+        //- No copy construct
         dictionaryEntry(const dictionaryEntry&) = delete;
 
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H
index 2e575713b9..7aaded38d1 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H
+++ b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H
@@ -65,7 +65,7 @@ class dictionaryListEntry
 {
     // Private Member Functions
 
-        //- Disallow bitwise copy
+        //- No copy construct
         dictionaryListEntry(const dictionaryListEntry&) = delete;
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
index c91f724a87..4326d10e70 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
@@ -136,10 +136,10 @@ class codeStream
         );
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         codeStream(const codeStream&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const codeStream&) = delete;
 
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.H
index 32dd478596..e58bf9f25d 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.H
@@ -67,10 +67,10 @@ class functionEntry
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         functionEntry(const functionEntry&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const functionEntry&) = delete;
 
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H
index f1d6a965c1..75c527cb54 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H
@@ -83,10 +83,10 @@ class codedBase
         //- Create library based on the dynamicCodeContext
         void createLibrary(dynamicCode&, const dynamicCodeContext&) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         codedBase(const codedBase&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const codedBase&) = delete;
 
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
index 1f3936c579..b40c4c4953 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
@@ -56,11 +56,11 @@ class dlLibraryTable
         DynamicList<fileName> libNames_;
 
 
-        //- Disallow default bitwise copy construct
-        dlLibraryTable(const dlLibraryTable&);
+        //- No copy construct
+        dlLibraryTable(const dlLibraryTable&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dlLibraryTable&);
+        //- No copy assignment
+        void operator=(const dlLibraryTable&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 7150594c3d..9f042bd231 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -147,10 +147,10 @@ class functionObject
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         functionObject(const functionObject&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const functionObject&) = delete;
 
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 0a4fa5aaa2..5d4597ed7c 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -104,10 +104,10 @@ class functionObjectList
         //- configuration files, add to the given map and recurse
         static void listDir(const fileName& dir, wordHashSet& foMap);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         functionObjectList(const functionObjectList&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const functionObjectList&) = delete;
 
 
diff --git a/src/OpenFOAM/db/functionObjects/logFiles/logFiles.H b/src/OpenFOAM/db/functionObjects/logFiles/logFiles.H
index 2a44d38b3e..5ec4e53a63 100644
--- a/src/OpenFOAM/db/functionObjects/logFiles/logFiles.H
+++ b/src/OpenFOAM/db/functionObjects/logFiles/logFiles.H
@@ -86,11 +86,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        logFiles(const logFiles&);
+        //- No copy construct
+        logFiles(const logFiles&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const logFiles&);
+        //- No copy assignment
+        void operator=(const logFiles&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
index 2e2e28f262..8ce0f95b86 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
@@ -135,10 +135,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         regionFunctionObject(const regionFunctionObject&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const regionFunctionObject&) = delete;
 
 
diff --git a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H
index d523042910..5cab13a16d 100644
--- a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H
@@ -77,10 +77,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         stateFunctionObject(const stateFunctionObject&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const stateFunctionObject&) = delete;
 
 
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
index 86b91b2466..d6e9086865 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
@@ -95,11 +95,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        timeControl(const timeControl&);
+        //- No copy construct
+        timeControl(const timeControl&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const timeControl&);
+        //- No copy assignment
+        void operator=(const timeControl&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
index 18a3e51461..38e657b98e 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
@@ -151,11 +151,11 @@ class timeControl
             const bool rampDirectionUp
         );
 
-        //- Disallow default bitwise copy construct
-        timeControl(const timeControl&);
+        //- No copy construct
+        timeControl(const timeControl&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const timeControl&);
+        //- No copy assignment
+        void operator=(const timeControl&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H
index 918d86a133..75160c7d8d 100644
--- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H
+++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H
@@ -108,11 +108,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        writeFile(const writeFile&);
+        //- No copy construct
+        writeFile(const writeFile&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const writeFile&);
+        //- No copy assignment
+        void operator=(const writeFile&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index b0471ef9ba..eb45cc670c 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -94,10 +94,10 @@ class objectRegistry
         );
 
 
-        //- Disallow Copy constructor
+        //- No copy construct
         objectRegistry(const objectRegistry&) = delete;
 
-        //- Disallow default bitwise copy construct and assignment
+        //- No copy assignment
         void operator=(const objectRegistry&) = delete;
 
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H
index 1a41c759c1..4fab477d56 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.H
@@ -108,8 +108,8 @@ private:
         //- Return Istream
         Istream& readStream(const bool valid = true);
 
-        //- Dissallow assignment
-        void operator=(const regIOobject&);
+        //- No copy assignment
+        void operator=(const regIOobject&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
index 66b15b65b8..e67a94688f 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
@@ -96,19 +96,24 @@ private:
             const bool preserveCouples
         );
 
-        ////- Disallow default bitwise copy construct
-        //SlicedGeometricField(const SlicedGeometricField&);
+        // Note - copy construct allowed
 
-        //- Disallow default bitwise assignment
-        void operator=(const SlicedGeometricField&);
+        //- No copy assignment
+        void operator=(const SlicedGeometricField&) = delete;
 
-        //- Disallow standard assignment to GeometricField,
+        //- No copy assignment from GeometricField,
         //  == assignment is allowed.
-        void operator=(const GeometricField<Type, PatchField, GeoMesh>&);
+        void operator=
+        (
+            const GeometricField<Type, PatchField, GeoMesh>&
+        ) = delete;
 
-        //- Disallow standard assignment to tmp<GeometricField>,
+        //- No copy assignment from tmp<GeometricField>,
         //  == assignment is allowed.
-        void operator=(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
+        void operator=
+        (
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>&
+        ) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/fields/cloud/cloud.H b/src/OpenFOAM/fields/cloud/cloud.H
index eab0f39042..bd2e73f746 100644
--- a/src/OpenFOAM/fields/cloud/cloud.H
+++ b/src/OpenFOAM/fields/cloud/cloud.H
@@ -58,10 +58,10 @@ class cloud
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         cloud(const cloud&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const cloud&) = delete;
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperPatchRef.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperPatchRef.H
index dc94e43fec..ea9ce1a3ee 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperPatchRef.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperPatchRef.H
@@ -55,11 +55,14 @@ class pointPatchFieldMapperPatchRef
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointPatchFieldMapperPatchRef(const pointPatchFieldMapperPatchRef&);
+        //- No copy construct
+        pointPatchFieldMapperPatchRef
+        (
+            const pointPatchFieldMapperPatchRef&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointPatchFieldMapperPatchRef&);
+        //- No copy assignment
+        void operator=(const pointPatchFieldMapperPatchRef&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/global/profiling/profiling.H b/src/OpenFOAM/global/profiling/profiling.H
index db7aa681ef..44b07ec7c0 100644
--- a/src/OpenFOAM/global/profiling/profiling.H
+++ b/src/OpenFOAM/global/profiling/profiling.H
@@ -132,10 +132,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         profiling(const profiling&) = delete;
 
-        //- Disallow copy assignment
+        //- No copy assignment
         void operator=(const profiling&) = delete;
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
index 131cfeb93f..8c67e39aa7 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
@@ -60,11 +60,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        interpolationWeights(const interpolationWeights&);
+        //- No copy construct
+        interpolationWeights(const interpolationWeights&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const interpolationWeights&);
+        //- No copy assignment
+        void operator=(const interpolationWeights&) = delete;
 
 protected:
 
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
index 9af12426f0..71b1c64305 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
@@ -114,11 +114,11 @@ class PatchToPatchInterpolation
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PatchToPatchInterpolation(const PatchToPatchInterpolation&);
+        //- No copy construct
+        PatchToPatchInterpolation(const PatchToPatchInterpolation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PatchToPatchInterpolation&);
+        //- No copy assignment
+        void operator=(const PatchToPatchInterpolation&) = delete;
 
         //- Calculate point weights
         void calcPointAddressing() const;
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
index 5b08d82f2c..4e91cf1268 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
@@ -68,11 +68,14 @@ class PrimitivePatchInterpolation
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PrimitivePatchInterpolation(const PrimitivePatchInterpolation&);
+        //- No copy construct
+        PrimitivePatchInterpolation
+        (
+            const PrimitivePatchInterpolation&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PrimitivePatchInterpolation&);
+        //- No copy assignment
+        void operator=(const PrimitivePatchInterpolation&) = delete;
 
 
         //- Face-to-point weights
diff --git a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H
index 680999cbc6..7a0e200395 100644
--- a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H
+++ b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H
@@ -95,8 +95,8 @@ class uniformInterpolationTable
         //- Check that the table is valid
         void checkTable() const;
 
-        //- Disallow default bitwise assignment
-        void operator=(const uniformInterpolationTable&);
+        //- No copy assignment
+        void operator=(const uniformInterpolationTable&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
index cad2a86954..235c97086e 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
@@ -71,8 +71,8 @@ class procLduInterface
 
     // Private Member Functions
 
-        //- Dissallow construction as copy
-        procLduInterface(const procLduInterface&);
+        //- No copy construct
+        procLduInterface(const procLduInterface&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduMatrix.H b/src/OpenFOAM/matrices/LUscalarMatrix/procLduMatrix.H
index 8666700160..d6a0b53b0b 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduMatrix.H
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduMatrix.H
@@ -73,8 +73,8 @@ class procLduMatrix
 
     // Private Member Functions
 
-        //- Dissallow construction as copy
-        procLduMatrix(const procLduMatrix&);
+        //- No copy construct
+        procLduMatrix(const procLduMatrix&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
index e1fd26b6c1..a5eb8aa32f 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
@@ -60,11 +60,11 @@ class LduInterfaceField
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        LduInterfaceField(const LduInterfaceField&);
+        //- No copy construct
+        LduInterfaceField(const LduInterfaceField&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const LduInterfaceField&);
+        //- No copy assignment
+        void operator=(const LduInterfaceField&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
index f35342aa8b..ab2fd98a52 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
@@ -62,11 +62,11 @@ class DiagonalPreconditioner
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        DiagonalPreconditioner(const DiagonalPreconditioner&);
+        //- No copy construct
+        DiagonalPreconditioner(const DiagonalPreconditioner&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const DiagonalPreconditioner&);
+        //- No copy assignment
+        void operator=(const DiagonalPreconditioner&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
index 856b4673f9..2bd99d91d4 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
@@ -53,11 +53,11 @@ class NoPreconditioner
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        NoPreconditioner(const NoPreconditioner&);
+        //- No copy construct
+        NoPreconditioner(const NoPreconditioner&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const NoPreconditioner&);
+        //- No copy assignment
+        void operator=(const NoPreconditioner&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
index cd771ed8ba..4b59624296 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
@@ -53,11 +53,11 @@ class DiagonalSolver
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        DiagonalSolver(const DiagonalSolver&);
+        //- No copy construct
+        DiagonalSolver(const DiagonalSolver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const DiagonalSolver&);
+        //- No copy assignment
+        void operator=(const DiagonalSolver&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
index 1e7c85e41e..9d03eccfd0 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
@@ -54,11 +54,11 @@ class PBiCCCG
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PBiCCCG(const PBiCCCG&);
+        //- No copy construct
+        PBiCCCG(const PBiCCCG&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PBiCCCG&);
+        //- No copy assignment
+        void operator=(const PBiCCCG&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
index 8f4dd950da..fefdcf16f6 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
@@ -54,11 +54,11 @@ class PBiCICG
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PBiCICG(const PBiCICG&);
+        //- No copy construct
+        PBiCICG(const PBiCICG&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PBiCICG&);
+        //- No copy assignment
+        void operator=(const PBiCICG&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
index 7a6d01ff50..7e4572ced9 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
@@ -54,11 +54,11 @@ class PCICG
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PCICG(const PCICG&);
+        //- No copy construct
+        PCICG(const PCICG&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PCICG&);
+        //- No copy assignment
+        void operator=(const PCICG&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
index fa405d3738..7930f88157 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
@@ -131,11 +131,11 @@ class lduAddressing
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        lduAddressing(const lduAddressing&);
+        //- No copy construct
+        lduAddressing(const lduAddressing&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const lduAddressing&);
+        //- No copy assignment
+        void operator=(const lduAddressing&) = delete;
 
         //- Calculate losort
         void calcLosort() const;
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
index 36c9df4273..c60cbd078e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
@@ -55,11 +55,11 @@ class lduInterface
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        lduInterface(const lduInterface&);
+        //- No copy construct
+        lduInterface(const lduInterface&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const lduInterface&);
+        //- No copy assignment
+        void operator=(const lduInterface&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
index 3ce8c096d6..1c17e84425 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
@@ -67,11 +67,11 @@ class lduInterfaceField
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        lduInterfaceField(const lduInterfaceField&);
+        //- No copy construct
+        lduInterfaceField(const lduInterfaceField&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const lduInterfaceField&);
+        //- No copy assignment
+        void operator=(const lduInterfaceField&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
index a42c9a8b2a..15a30b2d63 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
@@ -67,11 +67,11 @@ class FDICPreconditioner
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        FDICPreconditioner(const FDICPreconditioner&);
+        //- No copy construct
+        FDICPreconditioner(const FDICPreconditioner&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const FDICPreconditioner&);
+        //- No copy assignment
+        void operator=(const FDICPreconditioner&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
index 20552e66fd..083f64d0a4 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
@@ -64,11 +64,11 @@ class diagonalPreconditioner
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        diagonalPreconditioner(const diagonalPreconditioner&);
+        //- No copy construct
+        diagonalPreconditioner(const diagonalPreconditioner&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const diagonalPreconditioner&);
+        //- No copy assignment
+        void operator=(const diagonalPreconditioner&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
index 549f873a96..762d5c9f55 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
@@ -55,11 +55,11 @@ class noPreconditioner
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        noPreconditioner(const noPreconditioner&);
+        //- No copy construct
+        noPreconditioner(const noPreconditioner&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const noPreconditioner&);
+        //- No copy assignment
+        void operator=(const noPreconditioner&) = delete;
 
 
 public:
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 ee426f2746..9a8bb8c05c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
@@ -207,11 +207,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        GAMGAgglomeration(const GAMGAgglomeration&);
+        //- No copy construct
+        GAMGAgglomeration(const GAMGAgglomeration&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const GAMGAgglomeration&);
+        //- No copy assignment
+        void operator=(const GAMGAgglomeration&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H
index 03a6b53e45..0fa8498a84 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H
@@ -58,11 +58,11 @@ class dummyAgglomeration
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        dummyAgglomeration(const dummyAgglomeration&);
+        //- No copy construct
+        dummyAgglomeration(const dummyAgglomeration&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dummyAgglomeration&);
+        //- No copy assignment
+        void operator=(const dummyAgglomeration&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H
index 02d6c5f1c4..283b8c86ea 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H
@@ -71,11 +71,11 @@ protected:
             const scalarField& faceWeights
         );
 
-        //- Disallow default bitwise copy construct
-        pairGAMGAgglomeration(const pairGAMGAgglomeration&);
+        //- No copy construct
+        pairGAMGAgglomeration(const pairGAMGAgglomeration&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pairGAMGAgglomeration&);
+        //- No copy assignment
+        void operator=(const pairGAMGAgglomeration&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
index 3bcd7d14fe..4afe1b1e8a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
@@ -84,11 +84,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        GAMGProcAgglomeration(const GAMGProcAgglomeration&);
+        //- No copy construct
+        GAMGProcAgglomeration(const GAMGProcAgglomeration&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const GAMGProcAgglomeration&);
+        //- No copy assignment
+        void operator=(const GAMGProcAgglomeration&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H
index 99bc37941c..d2c26945a8 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H
@@ -64,14 +64,14 @@ class eagerGAMGProcAgglomeration
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         eagerGAMGProcAgglomeration
         (
             const eagerGAMGProcAgglomeration&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const eagerGAMGProcAgglomeration&);
+        //- No copy assignment
+        void operator=(const eagerGAMGProcAgglomeration&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
index a7cdae8e4e..c2c06536c7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
@@ -89,14 +89,14 @@ class manualGAMGProcAgglomeration
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         manualGAMGProcAgglomeration
         (
             const manualGAMGProcAgglomeration&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const manualGAMGProcAgglomeration&);
+        //- No copy assignment
+        void operator=(const manualGAMGProcAgglomeration&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
index fef6b3519c..5718d5fad6 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
@@ -59,14 +59,14 @@ class masterCoarsestGAMGProcAgglomeration
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         masterCoarsestGAMGProcAgglomeration
         (
             const masterCoarsestGAMGProcAgglomeration&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const masterCoarsestGAMGProcAgglomeration&);
+        //- No copy assignment
+        void operator=(const masterCoarsestGAMGProcAgglomeration&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/noneGAMGProcAgglomeration/noneGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/noneGAMGProcAgglomeration/noneGAMGProcAgglomeration.H
index 253784ba25..f458fb3bce 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/noneGAMGProcAgglomeration/noneGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/noneGAMGProcAgglomeration/noneGAMGProcAgglomeration.H
@@ -55,14 +55,14 @@ class noneGAMGProcAgglomeration
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         noneGAMGProcAgglomeration
         (
             const noneGAMGProcAgglomeration&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const noneGAMGProcAgglomeration&);
+        //- No copy assignment
+        void operator=(const noneGAMGProcAgglomeration&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H
index 5c574c4158..e0bd3f15d0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H
@@ -87,14 +87,14 @@ class procFacesGAMGProcAgglomeration
         //- Do we need to agglomerate across processors?
         bool doProcessorAgglomeration(const lduMesh&) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         procFacesGAMGProcAgglomeration
         (
             const procFacesGAMGProcAgglomeration&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const procFacesGAMGProcAgglomeration&);
+        //- No copy assignment
+        void operator=(const procFacesGAMGProcAgglomeration&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceField.H
index cb2c9fecf1..bddead5838 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceField.H
@@ -61,11 +61,11 @@ class GAMGInterfaceField
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        GAMGInterfaceField(const GAMGInterfaceField&);
+        //- No copy construct
+        GAMGInterfaceField(const GAMGInterfaceField&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const GAMGInterfaceField&);
+        //- No copy assignment
+        void operator=(const GAMGInterfaceField&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
index 896db1bc9a..7435680517 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
@@ -67,11 +67,11 @@ class cyclicGAMGInterfaceField
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cyclicGAMGInterfaceField(const cyclicGAMGInterfaceField&);
+        //- No copy construct
+        cyclicGAMGInterfaceField(const cyclicGAMGInterfaceField&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cyclicGAMGInterfaceField&);
+        //- No copy assignment
+        void operator=(const cyclicGAMGInterfaceField&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
index fd65135586..f2159eceba 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
@@ -52,14 +52,14 @@ class processorCyclicGAMGInterfaceField
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         processorCyclicGAMGInterfaceField
         (
             const processorCyclicGAMGInterfaceField&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const processorCyclicGAMGInterfaceField&);
+        //- No copy assignment
+        void operator=(const processorCyclicGAMGInterfaceField&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
index 4d5b65a05c..a5ef5ad8e0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
@@ -83,11 +83,14 @@ class processorGAMGInterfaceField
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        processorGAMGInterfaceField(const processorGAMGInterfaceField&);
+        //- No copy construct
+        processorGAMGInterfaceField
+        (
+            const processorGAMGInterfaceField&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const processorGAMGInterfaceField&);
+        //- No copy assignment
+        void operator=(const processorGAMGInterfaceField&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
index c1b8009f29..08490b3ab9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
@@ -75,11 +75,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        GAMGInterface(const GAMGInterface&);
+        //- No copy construct
+        GAMGInterface(const GAMGInterface&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const GAMGInterface&);
+        //- No copy assignment
+        void operator=(const GAMGInterface&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
index b5bb64b452..dbaf98dbdb 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
@@ -69,11 +69,11 @@ class cyclicGAMGInterface
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cyclicGAMGInterface(const cyclicGAMGInterface&);
+        //- No copy construct
+        cyclicGAMGInterface(const cyclicGAMGInterface&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cyclicGAMGInterface&);
+        //- No copy assignment
+        void operator=(const cyclicGAMGInterface&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H
index 4f59e6b964..853d4e0656 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorCyclicGAMGInterface/processorCyclicGAMGInterface.H
@@ -53,11 +53,14 @@ class processorCyclicGAMGInterface
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        processorCyclicGAMGInterface(const processorCyclicGAMGInterface&);
+        //- No copy construct
+        processorCyclicGAMGInterface
+        (
+            const processorCyclicGAMGInterface&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const processorCyclicGAMGInterface&);
+        //- No copy assignment
+        void operator=(const processorCyclicGAMGInterface&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
index 4a1aa9454c..003635087b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
@@ -72,11 +72,11 @@ class processorGAMGInterface
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        processorGAMGInterface(const processorGAMGInterface&);
+        //- No copy construct
+        processorGAMGInterface(const processorGAMGInterface&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const processorGAMGInterface&);
+        //- No copy assignment
+        void operator=(const processorGAMGInterface&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
index 6e404e9e83..f680aa4e4d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
@@ -53,11 +53,11 @@ class PBiCG
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PBiCG(const PBiCG&);
+        //- No copy construct
+        PBiCG(const PBiCG&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PBiCG&);
+        //- No copy assignment
+        void operator=(const PBiCG&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H
index 44d9045a4b..a7dde7e280 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H
@@ -68,11 +68,11 @@ class PBiCGStab
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PBiCGStab(const PBiCGStab&);
+        //- No copy construct
+        PBiCGStab(const PBiCGStab&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PBiCGStab&);
+        //- No copy assignment
+        void operator=(const PBiCGStab&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
index 92b1b02d60..5e0731214b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
@@ -56,11 +56,11 @@ class PCG
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PCG(const PCG&);
+        //- No copy construct
+        PCG(const PCG&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PCG&);
+        //- No copy assignment
+        void operator=(const PCG&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
index ea0a754bb1..c4ae6d523b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
@@ -55,11 +55,11 @@ class diagonalSolver
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        diagonalSolver(const diagonalSolver&);
+        //- No copy construct
+        diagonalSolver(const diagonalSolver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const diagonalSolver&);
+        //- No copy assignment
+        void operator=(const diagonalSolver&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
index a384f22920..83c4e6ea9b 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
@@ -71,11 +71,11 @@ class SVD
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        SVD(const SVD&);
+        //- No copy construct
+        SVD(const SVD&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const SVD&);
+        //- No copy assignment
+        void operator=(const SVD&) = delete;
 
         template<class T>
         inline const T sign(const T& a, const T& b);
diff --git a/src/OpenFOAM/matrices/solution/solution.H b/src/OpenFOAM/matrices/solution/solution.H
index 78d6bb2ea8..3c07ad5e77 100644
--- a/src/OpenFOAM/matrices/solution/solution.H
+++ b/src/OpenFOAM/matrices/solution/solution.H
@@ -79,9 +79,11 @@ class solution
         //- Read settings from the dictionary
         void read(const dictionary&);
 
-        //- Disallow default bitwise copy construct and assignment
-        solution(const solution&);
-        void operator=(const solution&);
+        //- No copy construct
+        solution(const solution&) = delete;
+
+        //- No copy assignment
+        void operator=(const solution&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/matrices/tolerances/tolerances.H b/src/OpenFOAM/matrices/tolerances/tolerances.H
index 2c02c29a7a..be32a9df5f 100644
--- a/src/OpenFOAM/matrices/tolerances/tolerances.H
+++ b/src/OpenFOAM/matrices/tolerances/tolerances.H
@@ -59,9 +59,11 @@ class tolerances
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        tolerances(const tolerances&);
-        void operator=(const tolerances&);
+        //- No copy construct
+        tolerances(const tolerances&) = delete;
+
+        //- No copy assignment
+        void operator=(const tolerances&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtr.H b/src/OpenFOAM/memory/autoPtr/autoPtr.H
index a46ba0d0d1..0d88f1b61b 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtr.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtr.H
@@ -256,7 +256,7 @@ public:
 
     // Housekeeping
 
-        //- Disallow assignment from plain pointer
+        //- No copy assignment from plain pointer
         //  \deprecated Convenient, but uncontrolled access (FEB-2018)
         void operator=(T* p) = delete;
 };
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 736a7c4cca..b315ed34ef 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -241,7 +241,7 @@ public:
 
     // Housekeeping
 
-        //- Disallow assignment from literal nullptr.
+        //- No assignment from literal nullptr.
         //  Consistent with run-time check for nullptr on assignment.
         void operator=(std::nullptr_t) = delete;
 };
diff --git a/src/OpenFOAM/meshes/data/data.H b/src/OpenFOAM/meshes/data/data.H
index 9671fe3020..c24334928f 100644
--- a/src/OpenFOAM/meshes/data/data.H
+++ b/src/OpenFOAM/meshes/data/data.H
@@ -62,10 +62,10 @@ class data
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         data(const data&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const data&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
index 3c62577e4a..12a60773dc 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
@@ -78,11 +78,11 @@ class lduPrimitiveMesh
         //- Get size of all meshes
         static label totalSize(const PtrList<lduPrimitiveMesh>&);
 
-        //- Disallow default bitwise copy construct
-        lduPrimitiveMesh(const lduPrimitiveMesh&);
+        //- No copy construct
+        lduPrimitiveMesh(const lduPrimitiveMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const lduPrimitiveMesh&);
+        //- No copy assignment
+        void operator=(const lduPrimitiveMesh&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
index 3e2fcad6b2..02c0e48367 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
@@ -176,8 +176,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
+        //- No copy construct
         cellMatcher(const cellMatcher&) = delete;
+
+        //- No copy assignment
         cellMatcher& operator=(const cellMatcher&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
index 8959092c57..e52ba27914 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
@@ -63,10 +63,10 @@ class hexMatcher
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         hexMatcher(const hexMatcher&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         hexMatcher& operator=(const hexMatcher&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
index 5d4b8cfe35..c4c292f71f 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
@@ -63,10 +63,10 @@ class prismMatcher
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         prismMatcher(const prismMatcher&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         prismMatcher& operator=(const prismMatcher&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
index b6ddc60fc2..a24b5cac58 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
@@ -63,10 +63,10 @@ class pyrMatcher
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         pyrMatcher(const pyrMatcher&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         pyrMatcher& operator=(const pyrMatcher&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
index e1d3627d38..7fef5769f3 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
@@ -63,10 +63,10 @@ class tetMatcher
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         tetMatcher(const tetMatcher&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         tetMatcher& operator=(const tetMatcher&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
index 7da0e6ed1e..5e8b012360 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
@@ -63,10 +63,10 @@ class tetWedgeMatcher
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         tetWedgeMatcher(const tetWedgeMatcher&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         tetWedgeMatcher& operator=(const tetWedgeMatcher&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
index 5ec42255c8..c61e90e534 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
@@ -63,10 +63,10 @@ class wedgeMatcher
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         wedgeMatcher(const wedgeMatcher&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         wedgeMatcher& operator=(const wedgeMatcher&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H
index f07b03ea9a..f0abdc3beb 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H
@@ -65,11 +65,11 @@ class pointBoundaryMesh
         //- Calculate the geometry for the patches (transformation tensors etc.)
         void calcGeometry();
 
-        //- Disallow default bitwise copy construct
-        pointBoundaryMesh(const pointBoundaryMesh&);
+        //- No copy construct
+        pointBoundaryMesh(const pointBoundaryMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointBoundaryMesh&);
+        //- No copy assignment
+        void operator=(const pointBoundaryMesh&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
index 00331499ca..9680a6c7d7 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
@@ -50,11 +50,11 @@ class pointBoundaryMeshMapper
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointBoundaryMeshMapper(const pointBoundaryMeshMapper&);
+        //- No copy construct
+        pointBoundaryMeshMapper(const pointBoundaryMeshMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointBoundaryMeshMapper&);
+        //- No copy assignment
+        void operator=(const pointBoundaryMeshMapper&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
index b48c7cb238..33a99585df 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
@@ -89,11 +89,11 @@ class pointMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointMapper(const pointMapper&);
+        //- No copy construct
+        pointMapper(const pointMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointMapper&);
+        //- No copy assignment
+        void operator=(const pointMapper&) = delete;
 
 
         //- Calculate addressing for mapping with inserted points
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
index f53aa431c4..980aadcfc4 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
@@ -68,11 +68,11 @@ class pointMeshMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointMeshMapper(const pointMeshMapper&);
+        //- No copy construct
+        pointMeshMapper(const pointMeshMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointMeshMapper&);
+        //- No copy assignment
+        void operator=(const pointMeshMapper&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
index 54d89cbdef..8205263795 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
@@ -88,14 +88,11 @@ class pointPatchMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointPatchMapper
-        (
-            const pointPatchMapper&
-        );
+        //- No copy construct
+        pointPatchMapper(const pointPatchMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointPatchMapper&);
+        //- No copy assignment
+        void operator=(const pointPatchMapper&) = delete;
 
 
         //- Calculate addressing for mapping with inserted cells
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H
index f1d07d79b9..d8e306732d 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H
@@ -53,11 +53,11 @@ class coupledPointPatch
 {
     // Private Member Functions
 
-        //- Disallow default construct as copy
-        coupledPointPatch(const coupledPointPatch&);
+        //- No copy construct
+        coupledPointPatch(const coupledPointPatch&) = delete;
 
-        //- Disallow default assignment
-        void operator=(const coupledPointPatch&);
+        //- No copy assignment
+        void operator=(const coupledPointPatch&) = delete;
 
 
 protected:
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
index ffafe9447e..8831eecbf8 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
@@ -60,11 +60,11 @@ class cyclicPointPatch
 
     // Private Member Functions
 
-        //- Disallow default construct as copy
-        cyclicPointPatch(const cyclicPointPatch&);
+        //- No copy construct
+        cyclicPointPatch(const cyclicPointPatch&) = delete;
 
-        //- Disallow default assignment
-        void operator=(const cyclicPointPatch&);
+        //- No copy assignment
+        void operator=(const cyclicPointPatch&) = delete;
 
 
     // Demand driven private data
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
index 494d995fbf..8e1f5603d7 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
@@ -87,11 +87,11 @@ class processorPointPatch
         virtual void updateMesh(PstreamBuffers&);
 
 
-        //- Disallow default construct as copy
-        processorPointPatch(const processorPointPatch&);
+        //- No copy construct
+        processorPointPatch(const processorPointPatch&) = delete;
 
-        //- Disallow default assignment
-        void operator=(const processorPointPatch&);
+        //- No copy assignment
+        void operator=(const processorPointPatch&) = delete;
 
 public:
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H
index 3d2ec76dec..b1a882afca 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H
@@ -63,11 +63,11 @@ class processorCyclicPointPatch
 
         const processorCyclicPolyPatch& procCycPolyPatch_;
 
-        //- Disallow default construct as copy
-        processorCyclicPointPatch(const processorCyclicPointPatch&);
+        //- No copy construct
+        processorCyclicPointPatch(const processorCyclicPointPatch&) = delete;
 
-        //- Disallow default assignment
-        void operator=(const processorCyclicPointPatch&);
+        //- No copy assignment
+        void operator=(const processorCyclicPointPatch&) = delete;
 
 public:
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
index 91db5fc873..0d8f3ada86 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
@@ -63,11 +63,11 @@ class coupledFacePointPatch
 
     // Private Member Functions
 
-        //- Disallow default construct as copy
-        coupledFacePointPatch(const coupledFacePointPatch&);
+        //- No copy construct
+        coupledFacePointPatch(const coupledFacePointPatch&) = delete;
 
-        //- Disallow default assignment
-        void operator=(const coupledFacePointPatch&);
+        //- No copy assignment
+        void operator=(const coupledFacePointPatch&) = delete;
 
 
 protected:
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
index f5958be5e0..b7dddb59e8 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
@@ -89,11 +89,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        facePointPatch(const facePointPatch&);
+        //- No copy construct
+        facePointPatch(const facePointPatch&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const facePointPatch&);
+        //- No copy assignment
+        void operator=(const facePointPatch&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
index 4921d7fc4b..51705844bf 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
@@ -64,11 +64,11 @@ class pointPatch
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointPatch(const pointPatch&);
+        //- No copy construct
+        pointPatch(const pointPatch&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointPatch&);
+        //- No copy assignment
+        void operator=(const pointPatch&) = delete;
 
 
 protected:
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index 26b5763d37..5b0db8f9ca 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -303,11 +303,11 @@ class globalMeshData
             void calcGlobalCoPointSlaves() const;
 
 
-        //- Disallow default bitwise copy construct
-        globalMeshData(const globalMeshData&);
+        //- No copy construct
+        globalMeshData(const globalMeshData&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const globalMeshData&);
+        //- No copy assignment
+        void operator=(const globalMeshData&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
index cfb4f53eea..18c77b533c 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
@@ -262,11 +262,11 @@ class globalPoints
             const bool mergeSeparated
         );
 
-        //- Disallow default bitwise copy construct
-        globalPoints(const globalPoints&);
+        //- No copy construct
+        globalPoints(const globalPoints&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const globalPoints&);
+        //- No copy assignment
+        void operator=(const globalPoints&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
index 03da8e0821..197d9850d7 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
@@ -88,11 +88,11 @@ class cellMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellMapper(const cellMapper&);
+        //- No copy construct
+        cellMapper(const cellMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellMapper&);
+        //- No copy assignment
+        void operator=(const cellMapper&) = delete;
 
 
         //- Calculate addressing for mapping with inserted cells
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
index 199481ea71..545a9bb4fb 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
@@ -89,11 +89,11 @@ class faceMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faceMapper(const faceMapper&);
+        //- No copy construct
+        faceMapper(const faceMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faceMapper&);
+        //- No copy assignment
+        void operator=(const faceMapper&) = delete;
 
 
         //- Calculate addressing for mapping with inserted faces
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
index 2756e15395..63cc7eaf2a 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
@@ -101,7 +101,7 @@ class mapDistributePolyMesh
 
         void calcPatchSizes();
 
-        //- Disallow copy construct
+        //- No copy construct
         mapDistributePolyMesh(const mapDistributePolyMesh&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
index 5fd0673984..992219d729 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
@@ -272,11 +272,11 @@ class mapPolyMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        mapPolyMesh(const mapPolyMesh&);
+        //- No copy construct
+        mapPolyMesh(const mapPolyMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const mapPolyMesh&);
+        //- No copy assignment
+        void operator=(const mapPolyMesh&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 139e4fdbfb..c7f5ef70c5 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -81,10 +81,10 @@ class polyBoundaryMesh
         //- Calculate the geometry for the patches (transformation tensors etc.)
         void calcGeometry();
 
-        //- Disallow construct as copy
+        //- No copy construct
         polyBoundaryMesh(const polyBoundaryMesh&) = delete;
 
-        //- Disallow assignment
+        //- No copy assignment
         void operator=(const polyBoundaryMesh&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index da538b05f1..b7c0b5cbf2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -189,10 +189,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow construct as copy
+        //- No copy construct
         polyMesh(const polyMesh&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const polyMesh&) = delete;
 
         //- Initialise the polyMesh from the primitive data
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
index 0179ae6de6..94a8aa483c 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
@@ -93,10 +93,10 @@ class ZoneMesh
         );
 
 
-        //- Disallow construct as copy
+        //- No copy construct
         ZoneMesh(const ZoneMesh&) = delete;
 
-        //- Disallow assignment
+        //- No copy assignment
         void operator=(const ZoneMesh<ZoneType, MeshType>&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index ac6b10a9a4..2de745493c 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -66,7 +66,7 @@ class cellZone
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         cellZone(const cellZone&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 770e018b10..384b55777c 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -71,10 +71,10 @@ class faceZone
         //- Set flip-map to uniform value
         void setFlipMap(const bool val);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         faceZone(const faceZone&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const faceZone&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index ac11398afe..d2b5691cf6 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -67,7 +67,7 @@ class pointZone
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         pointZone(const pointZone&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
index 8d415054db..7c35235603 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
@@ -64,7 +64,7 @@ class zone
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         zone(const zone&) = delete;
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index c4d3b34f46..5e1f71275a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -178,11 +178,11 @@ class primitiveMesh
 
     // Private Member Functions
 
-        //- Disallow construct as copy
-        primitiveMesh(const primitiveMesh&);
+        //- No copy construct
+        primitiveMesh(const primitiveMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const primitiveMesh&);
+        //- No copy assignment
+        void operator=(const primitiveMesh&) = delete;
 
 
         // Topological calculations
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H
index bd1443a124..c7673f4efd 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H
@@ -94,11 +94,11 @@ class walkPatch
         );
 
 
-        //- Disallow default bitwise copy construct
-        walkPatch(const walkPatch&);
+        //- No copy construct
+        walkPatch(const walkPatch&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const walkPatch&);
+        //- No copy assignment
+        void operator=(const walkPatch&) = delete;
 
 public:
 
diff --git a/src/OpenFOAM/primitives/enums/Enum.H b/src/OpenFOAM/primitives/enums/Enum.H
index 3329aa1284..5de96faaa9 100644
--- a/src/OpenFOAM/primitives/enums/Enum.H
+++ b/src/OpenFOAM/primitives/enums/Enum.H
@@ -85,10 +85,10 @@ class Enum
         const word& getName(const EnumType e) const;
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         Enum(const Enum&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const Enum&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/enums/NamedEnum.H b/src/OpenFOAM/primitives/enums/NamedEnum.H
index ff7a0050ac..61d0eaf979 100644
--- a/src/OpenFOAM/primitives/enums/NamedEnum.H
+++ b/src/OpenFOAM/primitives/enums/NamedEnum.H
@@ -77,10 +77,10 @@ class NamedEnum
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         NamedEnum(const NamedEnum&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const NamedEnum&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
index ec2d1a6719..1f49b2788e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
@@ -104,7 +104,7 @@ class CSV
         //- Read the next value from the splitted string
         Type readValue(const List<string>&);
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const CSV<Type>&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
index 7fa5f0acb8..8a99e33c84 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
@@ -66,7 +66,7 @@ class Constant
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const Constant<Type>&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
index a13100cdf3..19b607bdbd 100644
--- a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
@@ -60,7 +60,7 @@ class OneConstant
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const OneConstant<Type>&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
index 46348ac3d0..f9ebeadc93 100644
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
@@ -76,7 +76,7 @@ class Polynomial
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const Polynomial<Type>&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
index ed66ef249e..d26c7abf63 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
@@ -104,7 +104,7 @@ class Scale
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const Scale<Type>&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index e4962dbf25..0c43ee3798 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -116,7 +116,7 @@ class Sine
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const Sine<Type>&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
index 38e5a33d09..d1c3abdffd 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
@@ -123,7 +123,7 @@ class Square
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const Square<Type>&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
index 931835cb26..ae7066f96e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
@@ -68,7 +68,7 @@ class Table
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const Table<Type>&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index d897be830d..260d2318ff 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
@@ -94,7 +94,7 @@ protected:
 
 private:
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const TableBase<Type>&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
index f4b70c9bd1..98a68c39fd 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
@@ -83,7 +83,7 @@ class TableFile
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const TableFile<Type>&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
index 836e82dfc8..620f141d56 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
@@ -63,8 +63,8 @@ class Uniform
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const Uniform<Type>&);
+        //- No copy assignment
+        void operator=(const Uniform<Type>&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
index a85772e21c..b1626545ef 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
@@ -60,7 +60,7 @@ class ZeroConstant
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ZeroConstant<Type>&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
index c326718c09..335f5805d4 100644
--- a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
@@ -58,7 +58,7 @@ class halfCosineRamp
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const halfCosineRamp&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
index 926a672d18..b62a2fb198 100644
--- a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
@@ -58,7 +58,7 @@ class linearRamp
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const linearRamp&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
index 3ccecd449a..2f4dd3e1ca 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
@@ -58,7 +58,7 @@ class quadraticRamp
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const quadraticRamp&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
index 5cfb47b560..70a7e188d6 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
@@ -58,7 +58,7 @@ class quarterCosineRamp
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const quarterCosineRamp&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
index 88b301402a..03d4969213 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
@@ -58,7 +58,7 @@ class quarterSineRamp
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const quarterSineRamp&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
index b386880ed5..37ff30c749 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
@@ -108,7 +108,7 @@ private:
         //- Read the coefficients from the given dictionary
         void read(const dictionary& coeffs);
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ramp&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.H b/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.H
index 500469d94f..223b91dc70 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.H
+++ b/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.H
@@ -104,8 +104,8 @@ class polynomialFunction
         );
 
 
-        //- Disallow default bitwise assignment
-        void operator=(const polynomialFunction&);
+        //- No copy assignment
+        void operator=(const polynomialFunction&) = delete;
 
 
 
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
index e53a9f71d6..ff982a6607 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
@@ -150,11 +150,11 @@ private:
             const labelPair& patchTrafo
         ) const;
 
-        //- Disallow default bitwise copy construct
-        globalIndexAndTransform(const globalIndexAndTransform&);
+        //- No copy construct
+        globalIndexAndTransform(const globalIndexAndTransform&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const globalIndexAndTransform&);
+        //- No copy assignment
+        void operator=(const globalIndexAndTransform&) = delete;
 
 
 public:
diff --git a/src/OpenFOAM/primitives/nullObject/nullObject.H b/src/OpenFOAM/primitives/nullObject/nullObject.H
index d2316fa5d3..b6cae6fb52 100644
--- a/src/OpenFOAM/primitives/nullObject/nullObject.H
+++ b/src/OpenFOAM/primitives/nullObject/nullObject.H
@@ -70,10 +70,10 @@ class NullObject
         content{nullptr}
     {}
 
-    //- Disallow default bitwise copy construct
+    //- No copy construct
     NullObject(const NullObject&) = delete;
 
-    //- Disallow default bitwise assignment
+    //- No copy assignment
     void operator=(const NullObject&) = delete;
 
 public:
diff --git a/src/OpenFOAM/primitives/strings/lists/CStringList.H b/src/OpenFOAM/primitives/strings/lists/CStringList.H
index 8ff6377589..55c48c3f9c 100644
--- a/src/OpenFOAM/primitives/strings/lists/CStringList.H
+++ b/src/OpenFOAM/primitives/strings/lists/CStringList.H
@@ -102,10 +102,10 @@ class CStringList
         int resetContent(const ListType& input);
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         CStringList(const CStringList&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const CStringList&) = delete;
 
 
diff --git a/src/OpenFOAM/primitives/subModelBase/subModelBase.H b/src/OpenFOAM/primitives/subModelBase/subModelBase.H
index a2c194ac2b..c130cb03b6 100644
--- a/src/OpenFOAM/primitives/subModelBase/subModelBase.H
+++ b/src/OpenFOAM/primitives/subModelBase/subModelBase.H
@@ -53,8 +53,8 @@ class subModelBase
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const subModelBase&);
+        //- No copy assignment
+        void operator=(const subModelBase&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H
index b92b3557bd..3a871cf131 100644
--- a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H
+++ b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H
@@ -84,9 +84,11 @@ class buoyantKEpsilon
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        buoyantKEpsilon(const buoyantKEpsilon&);
-        void operator=(const buoyantKEpsilon&);
+        //- No copy construct
+        buoyantKEpsilon(const buoyantKEpsilon&) = delete;
+
+        //- No copy assignment
+        void operator=(const buoyantKEpsilon&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
index a952fbeadc..97d26d860d 100644
--- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
@@ -73,11 +73,14 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        compressibleTurbulenceModel(const compressibleTurbulenceModel&);
+        //- No copy construct
+        compressibleTurbulenceModel
+        (
+            const compressibleTurbulenceModel&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const compressibleTurbulenceModel&);
+        //- No copy assignment
+        void operator=(const compressibleTurbulenceModel&) = delete;
 
 
 public:
diff --git a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H b/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H
index 99528cfb18..2c06004104 100644
--- a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H
@@ -74,11 +74,14 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        incompressibleTurbulenceModel(const incompressibleTurbulenceModel&);
+        //- No copy construct
+        incompressibleTurbulenceModel
+        (
+            const incompressibleTurbulenceModel&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const incompressibleTurbulenceModel&);
+        //- No copy assignment
+        void operator=(const incompressibleTurbulenceModel&) = delete;
 
 
 public:
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
index d45950335a..f24ddf1d98 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
@@ -68,9 +68,11 @@ class LamBremhorstKE
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        LamBremhorstKE(const LamBremhorstKE&);
-        void operator=(const LamBremhorstKE&);
+        //- No copy construct
+        LamBremhorstKE(const LamBremhorstKE&) = delete;
+
+        //- No copy assignment
+        void operator=(const LamBremhorstKE&) = delete;
 
         tmp<volScalarField> Rt() const;
         tmp<volScalarField> fMu(const volScalarField& Rt) const;
diff --git a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H
index 70503dbdd8..3ce71c7503 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H
+++ b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H
@@ -94,9 +94,11 @@ class NicenoKEqn
         >&
         gasTurbulence() const;
 
-        // Disallow default bitwise copy construct and assignment
-        NicenoKEqn(const NicenoKEqn&);
-        void operator=(const NicenoKEqn&);
+        //- No copy construct
+        NicenoKEqn(const NicenoKEqn&) = delete;
+
+        //- No copy assignment
+        void operator=(const NicenoKEqn&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H
index e243ba689f..a79b434a0a 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H
+++ b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H
@@ -92,9 +92,11 @@ class SmagorinskyZhang
         >&
         gasTurbulence() const;
 
-        // Disallow default bitwise copy construct and assignment
-        SmagorinskyZhang(const SmagorinskyZhang&);
-        void operator=(const SmagorinskyZhang&);
+        //- No copy construct
+        SmagorinskyZhang(const SmagorinskyZhang&) = delete;
+
+        //- No copy assignment
+        void operator=(const SmagorinskyZhang&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H
index fdf2d23738..ded941e4fe 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H
+++ b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H
@@ -82,9 +82,11 @@ class continuousGasKEqn
 
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        continuousGasKEqn(const continuousGasKEqn&);
-        void operator=(const continuousGasKEqn&);
+        //- No copy construct
+        continuousGasKEqn(const continuousGasKEqn&) = delete;
+
+        //- No copy assignment
+        void operator=(const continuousGasKEqn&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H
index 86dbf0d6da..93dc4bc73f 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H
@@ -96,9 +96,11 @@ class LaheyKEpsilon
         >&
         gasTurbulence() const;
 
-        // Disallow default bitwise copy construct and assignment
-        LaheyKEpsilon(const LaheyKEpsilon&);
-        void operator=(const LaheyKEpsilon&);
+        //- No copy construct
+        LaheyKEpsilon(const LaheyKEpsilon&) = delete;
+
+        //- No copy assignment
+        void operator=(const LaheyKEpsilon&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H
index 778a6f7dcb..a8953e6996 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H
@@ -89,9 +89,11 @@ class continuousGasKEpsilon
 
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        continuousGasKEpsilon(const continuousGasKEpsilon&);
-        void operator=(const continuousGasKEpsilon&);
+        //- No copy construct
+        continuousGasKEpsilon(const continuousGasKEpsilon&) = delete;
+
+        //- No copy assignment
+        void operator=(const continuousGasKEpsilon&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
index ac42f2a777..7d95f518b1 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
@@ -140,9 +140,11 @@ class kOmegaSSTSato
         gasTurbulence() const;
 
 
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSSTSato(const kOmegaSSTSato&);
-        void operator=(const kOmegaSSTSato&);
+        //- No copy construct
+        kOmegaSSTSato(const kOmegaSSTSato&) = delete;
+
+        //- No copy assignment
+        void operator=(const kOmegaSSTSato&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
index 09313c1106..5f0f38b371 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
@@ -92,9 +92,11 @@ class mixtureKEpsilon
 
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        mixtureKEpsilon(const mixtureKEpsilon&);
-        void operator=(const mixtureKEpsilon&);
+        //- No copy construct
+        mixtureKEpsilon(const mixtureKEpsilon&) = delete;
+
+        //- No copy assignment
+        void operator=(const mixtureKEpsilon&) = delete;
 
         //- Return the turbulence model for the other phase
         mixtureKEpsilon<BasicTurbulenceModel>& liquidTurbulence() const;
diff --git a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
index 645670e9bd..749348005c 100644
--- a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
+++ b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
@@ -167,11 +167,11 @@ class DEShybrid
         scalar CH2_;
         scalar CH3_;
 
-        //- Disallow default bitwise copy construct
-        DEShybrid(const DEShybrid&);
+        //- No copy construct
+        DEShybrid(const DEShybrid&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const DEShybrid&);
+        //- No copy assignment
+        void operator=(const DEShybrid&) = delete;
 
 
     // Private Member Functions
diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
index 3aec24ea69..a9c84051e4 100644
--- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
+++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
@@ -129,9 +129,11 @@ class kOmegaSSTBase
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSSTBase(const kOmegaSSTBase&);
-        void operator=(const kOmegaSSTBase&);
+        //- No copy construct
+        kOmegaSSTBase(const kOmegaSSTBase&) = delete;
+
+        //- No copy assignment
+        void operator=(const kOmegaSSTBase&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModel.H b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModel.H
index a05e3b49d4..d3864adab8 100644
--- a/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModel.H
+++ b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModel.H
@@ -59,11 +59,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        DESModel(const DESModel&);
+        //- No copy construct
+        DESModel(const DESModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const DESModel&);
+        //- No copy assignment
+        void operator=(const DESModel&) = delete;
 
 
 public:
diff --git a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
index e0346cd1f6..ea50d5e6a7 100644
--- a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
@@ -72,9 +72,11 @@ class SpalartAllmarasDDES
 
         tmp<volScalarField> rd(const volScalarField& magGradU) const;
 
-        // Disallow default bitwise copy construct and assignment
-        SpalartAllmarasDDES(const SpalartAllmarasDDES&);
-        void operator=(const SpalartAllmarasDDES&);
+        //- No copy construct
+        SpalartAllmarasDDES(const SpalartAllmarasDDES&) = delete;
+
+        //- No copy assignment
+        void operator=(const SpalartAllmarasDDES&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.H b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.H
index f84f39ec2e..da0bdfd6c4 100644
--- a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.H
+++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.H
@@ -81,9 +81,11 @@ class SpalartAllmarasDES
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        SpalartAllmarasDES(const SpalartAllmarasDES&);
-        void operator=(const SpalartAllmarasDES&);
+        //- No copy construct
+        SpalartAllmarasDES(const SpalartAllmarasDES&) = delete;
+
+        //- No copy assignment
+        void operator=(const SpalartAllmarasDES&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
index e7243d7708..29a950ca28 100644
--- a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -84,9 +84,11 @@ class SpalartAllmarasIDDES
         //- Delay function
         tmp<volScalarField> fdt(const volScalarField& magGradU) const;
 
-        // Disallow default bitwise copy construct and assignment
-        SpalartAllmarasIDDES(const SpalartAllmarasIDDES&);
-        void operator=(const SpalartAllmarasIDDES&);
+        //- No copy construct
+        SpalartAllmarasIDDES(const SpalartAllmarasIDDES&) = delete;
+
+        //- No copy assignment
+        void operator=(const SpalartAllmarasIDDES&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.H b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.H
index 80ee1b9311..f61c201210 100644
--- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.H
@@ -70,9 +70,11 @@ class kOmegaSSTDDES
 
         tmp<volScalarField> rd(const volScalarField& magGradU) const;
 
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSSTDDES(const kOmegaSSTDDES&);
-        void operator=(const kOmegaSSTDDES&);
+        //- No copy construct
+        kOmegaSSTDDES(const kOmegaSSTDDES&) = delete;
+
+        //- No copy assignment
+        void operator=(const kOmegaSSTDDES&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H
index 0f3cda9a9f..c4a10917f7 100644
--- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H
+++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H
@@ -72,9 +72,11 @@ class kOmegaSSTDES
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSSTDES(const kOmegaSSTDES&);
-        void operator=(const kOmegaSSTDES&);
+        //- No copy construct
+        kOmegaSSTDES(const kOmegaSSTDES&) = delete;
+
+        //- No copy assignment
+        void operator=(const kOmegaSSTDES&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.H b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.H
index e3ae10a2a3..7cb7f31d21 100644
--- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.H
@@ -83,9 +83,11 @@ class kOmegaSSTIDDES
         //- Delay function
         tmp<volScalarField> fdt(const volScalarField& magGradU) const;
 
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSSTIDDES(const kOmegaSSTIDDES&);
-        void operator=(const kOmegaSSTIDDES&);
+        //- No copy construct
+        kOmegaSSTIDDES(const kOmegaSSTIDDES&) = delete;
+
+        //- No copy assignment
+        void operator=(const kOmegaSSTIDDES&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
index fd6b47ca50..26f1907ba2 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -86,9 +86,11 @@ class DeardorffDiffStress
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        DeardorffDiffStress(const DeardorffDiffStress&);
-        void operator=(const DeardorffDiffStress&);
+        //- No copy construct
+        DeardorffDiffStress(const DeardorffDiffStress&) = delete;
+
+        //- No copy assignment
+        void operator=(const DeardorffDiffStress&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
index b3a57319aa..d4a4a6322f 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
@@ -98,11 +98,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        LESModel(const LESModel&);
+        //- No copy construct
+        LESModel(const LESModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const LESModel&);
+        //- No copy assignment
+        void operator=(const LESModel&) = delete;
 
 
 public:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
index 7b9769a948..a5a65147bd 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
@@ -65,9 +65,11 @@ class IDDESDelta
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        IDDESDelta(const IDDESDelta&);
-        void operator=(const IDDESDelta&);
+        //- No copy construct
+        IDDESDelta(const IDDESDelta&) = delete;
+
+        //- No copy assignment
+        void operator=(const IDDESDelta&) = delete;
 
         //- Calculate the delta values
         void calcDelta();
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
index b4cef87073..014b3b71f6 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
@@ -60,13 +60,13 @@ protected:
         volScalarField delta_;
 
 
-private:
+    // Protected Member Functions
 
-    // Private Member Functions
+        //- No copy construct
+        LESdelta(const LESdelta&) = delete;
 
-        // Disallow default bitwise copy construct and assignment
-        LESdelta(const LESdelta&);
-        void operator=(const LESdelta&);
+        //- No copy assignment
+        void operator=(const LESdelta&) = delete;
 
 
 public:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
index 59bd48f4f3..745aeb2532 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
@@ -85,9 +85,11 @@ class PrandtlDelta
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        PrandtlDelta(const PrandtlDelta&);
-        void operator=(const PrandtlDelta&);
+        //- No copy construct
+        PrandtlDelta(const PrandtlDelta&) = delete;
+
+        //- No copy assignment
+        void operator=(const PrandtlDelta&) = delete;
 
         // Calculate the delta values
         void calcDelta();
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
index 916049ea46..59b1a1df71 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
@@ -59,9 +59,11 @@ class cubeRootVolDelta
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        cubeRootVolDelta(const cubeRootVolDelta&);
-        void operator=(const cubeRootVolDelta&);
+        //- No copy construct
+        cubeRootVolDelta(const cubeRootVolDelta&) = delete;
+
+        //- No copy assignment
+        void operator=(const cubeRootVolDelta&) = delete;
 
 
 public:
@@ -82,13 +84,11 @@ public:
 
 
     //- Destructor
-    virtual ~cubeRootVolDelta()
-    {}
+    virtual ~cubeRootVolDelta() = default;
 
 
     // Member Functions
 
-
         //- Calculate the delta values
         void calcDelta();
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
index f981aaf6ea..34df52afa5 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
@@ -63,9 +63,11 @@ class maxDeltaxyz
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        maxDeltaxyz(const maxDeltaxyz&);
-        void operator=(const maxDeltaxyz&);
+        //- No copy construct
+        maxDeltaxyz(const maxDeltaxyz&) = delete;
+
+        //- No copy assignment
+        void operator=(const maxDeltaxyz&) = delete;
 
 
 public:
@@ -86,8 +88,7 @@ public:
 
 
     //- Destructor
-    virtual ~maxDeltaxyz()
-    {}
+    virtual ~maxDeltaxyz() = default;
 
 
     // Member Functions
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.H
index a52fe7b78f..62919588c2 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyzCubeRootLESDelta/maxDeltaxyzCubeRootLESDelta.H
@@ -57,9 +57,14 @@ class maxDeltaxyzCubeRootLESDelta
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        maxDeltaxyzCubeRootLESDelta(const maxDeltaxyzCubeRootLESDelta&);
-        void operator=(const maxDeltaxyzCubeRootLESDelta&);
+        //- No copy construct
+        maxDeltaxyzCubeRootLESDelta
+        (
+            const maxDeltaxyzCubeRootLESDelta&
+        ) = delete;
+
+        //- No copy assignment
+        void operator=(const maxDeltaxyzCubeRootLESDelta&) = delete;
 
         // Calculate the delta values
         void calcDelta();
@@ -89,8 +94,7 @@ public:
 
 
     //- Destructor
-    virtual ~maxDeltaxyzCubeRootLESDelta()
-    {}
+    virtual ~maxDeltaxyzCubeRootLESDelta() = default;
 
 
     // Member Functions
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
index 5c21dd21df..1933303a0f 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
@@ -220,9 +220,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        smoothDelta(const smoothDelta&);
-        void operator=(const smoothDelta&);
+        //- No copy construct and assignment
+        smoothDelta(const smoothDelta&) = delete;
+
+        //- No copy assignment
+        void operator=(const smoothDelta&) = delete;
 
         // Calculate the delta values
         void calcDelta();
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H
index 81feca5793..8271ccd8ae 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H
@@ -63,9 +63,11 @@ class vanDriestDelta
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        vanDriestDelta(const vanDriestDelta&);
-        void operator=(const vanDriestDelta&);
+        //- No copy construct
+        vanDriestDelta(const vanDriestDelta&) = delete;
+
+        //- No copy assignment
+        void operator=(const vanDriestDelta&) = delete;
 
         // Calculate the delta values
         void calcDelta();
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
index b98c95e3c1..e3430d123e 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
@@ -59,9 +59,11 @@ class LESeddyViscosity
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        LESeddyViscosity(const LESeddyViscosity&);
-        void operator=(const LESeddyViscosity&);
+        //- No copy construct
+        LESeddyViscosity(const LESeddyViscosity&) = delete;
+
+        //- No copy assignment
+        void operator=(const LESeddyViscosity&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
index 11c366356d..2c06fa1313 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
@@ -61,9 +61,11 @@ class LESfilter
 
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        LESfilter(const LESfilter&);
-        void operator=(const LESfilter&);
+        //- No copy construct
+        LESfilter(const LESfilter&) = delete;
+
+        //- No copy assignment
+        void operator=(const LESfilter&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H
index aac332e3a5..754c875452 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H
@@ -66,9 +66,11 @@ class anisotropicFilter
 
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        anisotropicFilter(const anisotropicFilter&);
-        void operator=(const anisotropicFilter&);
+        //- No copy construct
+        anisotropicFilter(const anisotropicFilter&) = delete;
+
+        //- No copy assignment
+        void operator=(const anisotropicFilter&) = delete;
 
 
 public:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H
index bb7ad27eec..5d18a7067a 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H
@@ -66,9 +66,11 @@ class laplaceFilter
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        laplaceFilter(const laplaceFilter&);
-        void operator=(const laplaceFilter&);
+        //- No copy construct
+        laplaceFilter(const laplaceFilter&) = delete;
+
+        //- No copy assignment
+        void operator=(const laplaceFilter&) = delete;
 
 
 public:
@@ -87,8 +89,7 @@ public:
 
 
     //- Destructor
-    virtual ~laplaceFilter()
-    {}
+    virtual ~laplaceFilter() = default;
 
 
     // Member Functions
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H
index f14af21b21..5e11d29cfb 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H
@@ -55,9 +55,11 @@ class simpleFilter
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        simpleFilter(const simpleFilter&);
-        void operator=(const simpleFilter&);
+        //- No copy construct
+        simpleFilter(const simpleFilter&) = delete;
+
+        //- No copy assignment
+        void operator=(const simpleFilter&) = delete;
 
 
 public:
@@ -76,8 +78,7 @@ public:
 
 
     //- Destructor
-    virtual ~simpleFilter()
-    {}
+    virtual ~simpleFilter() = default;
 
 
     // Member Functions
diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H
index 7fb9654a4a..9a4f2df77a 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H
@@ -93,9 +93,11 @@ class Smagorinsky
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        Smagorinsky(const Smagorinsky&);
-        void operator=(const Smagorinsky&);
+        //- No copy construct
+        Smagorinsky(const Smagorinsky&) = delete;
+
+        //- No copy assignment
+        void operator=(const Smagorinsky&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H
index 34f796d164..b16252d033 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H
@@ -80,9 +80,11 @@ class WALE
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        WALE(const WALE&);
-        void operator=(const WALE&);
+        //- No copy construct
+        WALE(const WALE&) = delete;
+
+        //- No copy assignment
+        void operator=(const WALE&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H
index cc2bf38e42..b013a6b764 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H
@@ -80,9 +80,11 @@ class dynamicKEqn
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        dynamicKEqn(const dynamicKEqn&);
-        void operator=(const dynamicKEqn&);
+        //- No copy construct
+        dynamicKEqn(const dynamicKEqn&) = delete;
+
+        //- No copy assignment
+        void operator=(const dynamicKEqn&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H
index 5b4580e869..6d0d5d9f54 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H
@@ -66,9 +66,11 @@ class dynamicLagrangian
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        dynamicLagrangian(const dynamicLagrangian&);
-        void operator=(const dynamicLagrangian&);
+        //- No copy construct
+        dynamicLagrangian(const dynamicLagrangian&) = delete;
+
+        //- No copy assignment
+        void operator=(const dynamicLagrangian&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
index c5e6ecbd66..92b8efce86 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
@@ -76,13 +76,6 @@ class kEqn
 :
     public LESeddyViscosity<BasicTurbulenceModel>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        kEqn(const kEqn&);
-        void operator=(const kEqn&);
-
-
 protected:
 
     // Protected data
@@ -99,6 +92,13 @@ protected:
 
     // Protected Member Functions
 
+        //- No copy construct
+        kEqn(const kEqn&) = delete;
+
+        //- No copy assignment
+        void operator=(const kEqn&) = delete;
+
+
         virtual void correctNut();
         virtual tmp<fvScalarMatrix> kSource() const;
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
index 08ac25e6f0..befe39dca0 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
@@ -104,9 +104,11 @@ class LRR
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        LRR(const LRR&);
-        void operator=(const LRR&);
+        //- No copy construct
+        LRR(const LRR&) = delete;
+
+        //- No copy assignment
+        void operator=(const LRR&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index f919a54435..98b6d9a387 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -88,9 +88,11 @@ class LaunderSharmaKE
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        LaunderSharmaKE(const LaunderSharmaKE&);
-        void operator=(const LaunderSharmaKE&);
+        //- No copy construct
+        LaunderSharmaKE(const LaunderSharmaKE&) = delete;
+
+        //- No copy assignment
+        void operator=(const LaunderSharmaKE&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
index cf862ef5e3..cbba812d8b 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
@@ -88,11 +88,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        RASModel(const RASModel&);
+        //- No copy construct
+        RASModel(const RASModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const RASModel&);
+        //- No copy assignment
+        void operator=(const RASModel&) = delete;
 
 
 public:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
index 374a74bfc7..623a03c0cb 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -89,9 +89,11 @@ class RNGkEpsilon
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        RNGkEpsilon(const RNGkEpsilon&);
-        void operator=(const RNGkEpsilon&);
+        //- No copy construct
+        RNGkEpsilon(const RNGkEpsilon&) = delete;
+
+        //- No copy assignment
+        void operator=(const RNGkEpsilon&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
index 2e3b52a5ee..d736844d52 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
@@ -99,9 +99,11 @@ class SSG
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        SSG(const SSG&);
-        void operator=(const SSG&);
+        //- No copy construct
+        SSG(const SSG&) = delete;
+
+        //- No copy assignment
+        void operator=(const SSG&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
index 47694e4ab1..c59d277387 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -92,9 +92,11 @@ class SpalartAllmaras
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        SpalartAllmaras(const SpalartAllmaras&);
-        void operator=(const SpalartAllmaras&);
+        //- No copy construct
+        SpalartAllmaras(const SpalartAllmaras&) = delete;
+
+        //- No copy assignment
+        void operator=(const SpalartAllmaras&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
index a4126d2efc..3f48fa2d7c 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
@@ -90,9 +90,11 @@ class kEpsilon
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        kEpsilon(const kEpsilon&);
-        void operator=(const kEpsilon&);
+        //- No copy construct
+        kEpsilon(const kEpsilon&) = delete;
+
+        //- No copy assignment
+        void operator=(const kEpsilon&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
index 0210d66114..b3b49b9876 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
@@ -130,9 +130,11 @@ class kOmegaSST
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSST(const kOmegaSST&);
-        void operator=(const kOmegaSST&);
+        //- No copy construct
+        kOmegaSST(const kOmegaSST&) = delete;
+
+        //- No copy assignment
+        void operator=(const kOmegaSST&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H
index 88626ff1ed..3af5d4d7de 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H
@@ -108,9 +108,11 @@ class kOmegaSSTLM
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSSTLM(const kOmegaSSTLM&);
-        void operator=(const kOmegaSSTLM&);
+        //- No copy construct
+        kOmegaSSTLM(const kOmegaSSTLM&) = delete;
+
+        //- No copy assignment
+        void operator=(const kOmegaSSTLM&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
index 19b9db63c7..6a86a933eb 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -102,9 +102,11 @@ class kOmegaSSTSAS
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSSTSAS(const kOmegaSSTSAS&);
-        void operator=(const kOmegaSSTSAS&);
+        //- No copy construct
+        kOmegaSSTSAS(const kOmegaSSTSAS&) = delete;
+
+        //- No copy assignment
+        void operator=(const kOmegaSSTSAS&) = delete;
 
 
 protected:
diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
index 61e0ac3d7f..8a820626e2 100644
--- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
@@ -79,11 +79,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        TurbulenceModel(const TurbulenceModel&);
+        //- No copy construct
+        TurbulenceModel(const TurbulenceModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const TurbulenceModel&);
+        //- No copy assignment
+        void operator=(const TurbulenceModel&) = delete;
 
 
 public:
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H
index ad5466e0ff..dbfb440c22 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H
@@ -76,11 +76,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        laminarModel(const laminarModel&);
+        //- No copy construct
+        laminarModel(const laminarModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const laminarModel&);
+        //- No copy assignment
+        void operator=(const laminarModel&) = delete;
 
 
 public:
diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
index 43b848b23f..51b10d16d5 100644
--- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
@@ -82,11 +82,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        turbulenceModel(const turbulenceModel&);
+        //- No copy construct
+        turbulenceModel(const turbulenceModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const turbulenceModel&);
+        //- No copy assignment
+        void operator=(const turbulenceModel&) = delete;
 
 
 public:
diff --git a/src/combustionModels/EDC/EDC.H b/src/combustionModels/EDC/EDC.H
index a59fc55bcf..ba57803084 100644
--- a/src/combustionModels/EDC/EDC.H
+++ b/src/combustionModels/EDC/EDC.H
@@ -151,11 +151,11 @@ class EDC
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        EDC(const EDC&);
+        //- No copy construct
+        EDC(const EDC&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const EDC&);
+        //- No copy assignment
+        void operator=(const EDC&) = delete;
 
 
 public:
diff --git a/src/combustionModels/FSD/FSD.H b/src/combustionModels/FSD/FSD.H
index 42854d7b2d..edbc46d31f 100644
--- a/src/combustionModels/FSD/FSD.H
+++ b/src/combustionModels/FSD/FSD.H
@@ -123,11 +123,11 @@ class FSD
         //- Calculate the normalised fuel source term
         void calculateSourceNorm();
 
-        //- Disallow copy construct
-        FSD(const FSD&);
+        //- No copy construct
+        FSD(const FSD&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const FSD&);
+        //- No copy assignment
+        void operator=(const FSD&) = delete;
 
 
 public:
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.H b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.H
index c7f35d0c7d..b6eafce525 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.H
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.H
@@ -69,11 +69,11 @@ class consumptionSpeed
         //- Return consumption rate
         scalar omega0Sigma(scalar sigma, scalar a) const;
 
-        //- Disallow copy construct
-        consumptionSpeed(const consumptionSpeed&);
+        //- No copy construct
+        consumptionSpeed(const consumptionSpeed&) = delete;
 
-         //- Disallow default bitwise assignment
-        void operator=(const consumptionSpeed&);
+         //- No copy assignment
+        void operator=(const consumptionSpeed&) = delete;
 
 
 public:
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.H b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.H
index 2efeed191c..5d05f70505 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.H
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.H
@@ -79,11 +79,11 @@ private:
 
     // Private member functions
 
-         //- Disallow copy construct
-        reactionRateFlameArea(const reactionRateFlameArea&);
+         //- No copy construct
+        reactionRateFlameArea(const reactionRateFlameArea&) = delete;
 
-         //- Disallow default bitwise assignment
-        void operator=(const reactionRateFlameArea&);
+         //- No copy assignment
+        void operator=(const reactionRateFlameArea&) = delete;
 
 
 public:
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.H b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.H
index 33cead008c..3646c4c8f2 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.H
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.H
@@ -67,11 +67,11 @@ class relaxation
 
      // Private Member Functions
 
-        //- Disallow copy construct
-        relaxation(const relaxation&);
+        //- No copy construct
+        relaxation(const relaxation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const relaxation&);
+        //- No copy assignment
+        void operator=(const relaxation&) = delete;
 
 
 public:
diff --git a/src/combustionModels/PaSR/PaSR.H b/src/combustionModels/PaSR/PaSR.H
index e83b3eb52e..05310867b9 100644
--- a/src/combustionModels/PaSR/PaSR.H
+++ b/src/combustionModels/PaSR/PaSR.H
@@ -71,11 +71,11 @@ class PaSR
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        PaSR(const PaSR&);
+        //- No copy construct
+        PaSR(const PaSR&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PaSR&);
+        //- No copy assignment
+        void operator=(const PaSR&) = delete;
 
 
 public:
diff --git a/src/combustionModels/combustionModel/combustionModel.H b/src/combustionModels/combustionModel/combustionModel.H
index bfb46167b1..7f3361e09a 100644
--- a/src/combustionModels/combustionModel/combustionModel.H
+++ b/src/combustionModels/combustionModel/combustionModel.H
@@ -56,11 +56,11 @@ class combustionModel
 {
     // Private Member Functions
 
-        //- Disallow copy construct
-        combustionModel(const combustionModel&);
+        //- No copy construct
+        combustionModel(const combustionModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const combustionModel&);
+        //- No copy assignment
+        void operator=(const combustionModel&) = delete;
 
 
 protected:
diff --git a/src/combustionModels/diffusion/diffusion.H b/src/combustionModels/diffusion/diffusion.H
index 2a01905b0c..ded506ef69 100644
--- a/src/combustionModels/diffusion/diffusion.H
+++ b/src/combustionModels/diffusion/diffusion.H
@@ -69,11 +69,11 @@ class diffusion
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        diffusion(const diffusion&);
+        //- No copy construct
+        diffusion(const diffusion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const diffusion&);
+        //- No copy assignment
+        void operator=(const diffusion&) = delete;
 
 
 public:
diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H
index 14bfd7b89f..3f7a79c924 100644
--- a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H
+++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H
@@ -151,11 +151,11 @@ class diffusionMulticomponent
         //- Initialize
         void init();
 
-        //- Disallow copy construct
-        diffusionMulticomponent(const diffusionMulticomponent&);
+        //- No copy construct
+        diffusionMulticomponent(const diffusionMulticomponent&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const diffusionMulticomponent&);
+        //- No copy assignment
+        void operator=(const diffusionMulticomponent&) = delete;
 
 
 public:
diff --git a/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.H b/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.H
index 4424628788..a4f2785c95 100644
--- a/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.H
+++ b/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.H
@@ -68,11 +68,14 @@ class eddyDissipationDiffusionModel
 
     // Private member functions
 
-        //- Disallow copy construct
-        eddyDissipationDiffusionModel(const eddyDissipationDiffusionModel&);
+        //- No copy construct
+        eddyDissipationDiffusionModel
+        (
+            const eddyDissipationDiffusionModel&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const eddyDissipationDiffusionModel&);
+        //- No copy assignment
+        void operator=(const eddyDissipationDiffusionModel&) = delete;
 
 
 public:
diff --git a/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.H b/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.H
index 6803551d85..8714d37f5f 100644
--- a/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.H
+++ b/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.H
@@ -64,11 +64,11 @@ class eddyDissipationModelBase
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        eddyDissipationModelBase(const eddyDissipationModelBase&);
+        //- No copy construct
+        eddyDissipationModelBase(const eddyDissipationModelBase&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const eddyDissipationModelBase&);
+        //- No copy assignment
+        void operator=(const eddyDissipationModelBase&) = delete;
 
 
 public:
diff --git a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
index 8c899b76d5..0dfcacd32d 100644
--- a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
+++ b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
@@ -66,11 +66,11 @@ class infinitelyFastChemistry
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        infinitelyFastChemistry(const infinitelyFastChemistry&);
+        //- No copy construct
+        infinitelyFastChemistry(const infinitelyFastChemistry&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const infinitelyFastChemistry&);
+        //- No copy assignment
+        void operator=(const infinitelyFastChemistry&) = delete;
 
 
 public:
diff --git a/src/combustionModels/laminar/laminar.H b/src/combustionModels/laminar/laminar.H
index 073cd101e5..dcc562630f 100644
--- a/src/combustionModels/laminar/laminar.H
+++ b/src/combustionModels/laminar/laminar.H
@@ -71,11 +71,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        laminar(const laminar&);
+        //- No copy construct
+        laminar(const laminar&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const laminar&);
+        //- No copy assignment
+        void operator=(const laminar&) = delete;
 
 
 public:
diff --git a/src/combustionModels/noCombustion/noCombustion.H b/src/combustionModels/noCombustion/noCombustion.H
index 0438c62121..b9f2663c3f 100644
--- a/src/combustionModels/noCombustion/noCombustion.H
+++ b/src/combustionModels/noCombustion/noCombustion.H
@@ -55,11 +55,11 @@ class noCombustion
     public CombThermoType
 {
 
-    //- Disallow copy construct
-    noCombustion(const noCombustion&);
+    //- No copy construct
+    noCombustion(const noCombustion&) = delete;
 
-    //- Disallow default bitwise assignment
-    void operator=(const noCombustion&);
+    //- No copy assignment
+    void operator=(const noCombustion&) = delete;
 
 
 public:
diff --git a/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H
index 6da4496659..29bfdf4c35 100644
--- a/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H
+++ b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H
@@ -59,8 +59,8 @@ class psiChemistryCombustion
         //- Construct as copy (not implemented)
         psiChemistryCombustion(const psiChemistryCombustion&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const psiChemistryCombustion&);
+        //- No copy assignment
+        void operator=(const psiChemistryCombustion&) = delete;
 
 
 protected:
diff --git a/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.H b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.H
index ae4a75c41b..060b4fae9b 100644
--- a/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.H
+++ b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.H
@@ -62,8 +62,8 @@ class psiCombustionModel
         //- Construct as copy (not implemented)
         psiCombustionModel(const psiCombustionModel&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const psiCombustionModel&);
+        //- No copy assignment
+        void operator=(const psiCombustionModel&) = delete;
 
 
 public:
diff --git a/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.H b/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.H
index f922e1a44d..25c6ca5363 100644
--- a/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.H
+++ b/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.H
@@ -59,8 +59,8 @@ class psiThermoCombustion
         //- Construct as copy (not implemented)
         psiThermoCombustion(const psiThermoCombustion&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const psiThermoCombustion&);
+        //- No copy assignment
+        void operator=(const psiThermoCombustion&) = delete;
 
 
 protected:
diff --git a/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H
index 93d4731026..d5eb382243 100644
--- a/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H
+++ b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H
@@ -59,8 +59,8 @@ class rhoChemistryCombustion
         //- Construct as copy (not implemented)
         rhoChemistryCombustion(const rhoChemistryCombustion&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const rhoChemistryCombustion&);
+        //- No copy assignment
+        void operator=(const rhoChemistryCombustion&) = delete;
 
 
 protected:
diff --git a/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.H b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.H
index 2e261a5b98..3a8a9175b4 100644
--- a/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.H
+++ b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.H
@@ -63,8 +63,8 @@ class rhoCombustionModel
         //- Construct as copy (not implemented)
         rhoCombustionModel(const rhoCombustionModel&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const rhoCombustionModel&);
+        //- No copy assignment
+        void operator=(const rhoCombustionModel&) = delete;
 
 
 public:
diff --git a/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.H b/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.H
index 43041d4601..1362bcead4 100644
--- a/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.H
+++ b/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.H
@@ -59,8 +59,8 @@ class rhoThermoCombustion
         //- Construct as copy (not implemented)
         rhoThermoCombustion(const rhoThermoCombustion&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const rhoThermoCombustion&);
+        //- No copy assignment
+        void operator=(const rhoThermoCombustion&) = delete;
 
 
 protected:
diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.H b/src/combustionModels/singleStepCombustion/singleStepCombustion.H
index b7c5cb5c56..17219906d5 100644
--- a/src/combustionModels/singleStepCombustion/singleStepCombustion.H
+++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.H
@@ -58,11 +58,11 @@ class singleStepCombustion
 {
     // Private Member Functions
 
-        //- Disallow copy construct
-        singleStepCombustion(const singleStepCombustion&);
+        //- No copy construct
+        singleStepCombustion(const singleStepCombustion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const singleStepCombustion&);
+        //- No copy assignment
+        void operator=(const singleStepCombustion&) = delete;
 
 
 protected:
diff --git a/src/combustionModels/zoneCombustion/zoneCombustion.H b/src/combustionModels/zoneCombustion/zoneCombustion.H
index 351b40cab0..d728732e1d 100644
--- a/src/combustionModels/zoneCombustion/zoneCombustion.H
+++ b/src/combustionModels/zoneCombustion/zoneCombustion.H
@@ -71,11 +71,11 @@ class zoneCombustion
         //- Filter the given field on the cellZones
         tmp<volScalarField> filter(const tmp<volScalarField>& tS) const;
 
-        //- Disallow copy construct
-        zoneCombustion(const zoneCombustion&);
+        //- No copy construct
+        zoneCombustion(const zoneCombustion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const zoneCombustion&);
+        //- No copy assignment
+        void operator=(const zoneCombustion&) = delete;
 
 
 public:
diff --git a/src/conversion/ccm/common/ccmBase.H b/src/conversion/ccm/common/ccmBase.H
index 05daec336e..4724fac348 100644
--- a/src/conversion/ccm/common/ccmBase.H
+++ b/src/conversion/ccm/common/ccmBase.H
@@ -62,10 +62,10 @@ class base
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         base(const base&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const base&) = delete;
 
 
diff --git a/src/conversion/ccm/reader/ccmReader.H b/src/conversion/ccm/reader/ccmReader.H
index d7790ededa..7d8427631b 100644
--- a/src/conversion/ccm/reader/ccmReader.H
+++ b/src/conversion/ccm/reader/ccmReader.H
@@ -297,10 +297,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         reader(const reader&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const reader&) = delete;
 
 
diff --git a/src/conversion/ccm/writer/ccmWriter.H b/src/conversion/ccm/writer/ccmWriter.H
index c7b71c6311..12a3d544ae 100644
--- a/src/conversion/ccm/writer/ccmWriter.H
+++ b/src/conversion/ccm/writer/ccmWriter.H
@@ -147,10 +147,10 @@ class writer
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         writer(const writer&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const writer&) = delete;
 
 
diff --git a/src/conversion/common/reader/meshReader.H b/src/conversion/common/reader/meshReader.H
index 1af44e4d04..0512fa5348 100644
--- a/src/conversion/common/reader/meshReader.H
+++ b/src/conversion/common/reader/meshReader.H
@@ -136,10 +136,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         meshReader(const meshReader&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const meshReader&) = delete;
 
         //- Calculate pointCells
diff --git a/src/conversion/common/tables/boundaryRegion.H b/src/conversion/common/tables/boundaryRegion.H
index 1cb736b84c..97df61930b 100644
--- a/src/conversion/common/tables/boundaryRegion.H
+++ b/src/conversion/common/tables/boundaryRegion.H
@@ -74,7 +74,7 @@ class boundaryRegion
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         boundaryRegion(const boundaryRegion&) = delete;
 
 
diff --git a/src/conversion/common/tables/cellTable.H b/src/conversion/common/tables/cellTable.H
index 45cbadccc5..4ab85b9244 100644
--- a/src/conversion/common/tables/cellTable.H
+++ b/src/conversion/common/tables/cellTable.H
@@ -98,7 +98,7 @@ class cellTable
 
         void setEntry(const label id, const word& keyWord, const word& value);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         cellTable(const cellTable&) = delete;
 
 
diff --git a/src/conversion/common/writer/meshWriter.H b/src/conversion/common/writer/meshWriter.H
index e01a9ad6a2..4b139bde44 100644
--- a/src/conversion/common/writer/meshWriter.H
+++ b/src/conversion/common/writer/meshWriter.H
@@ -81,10 +81,10 @@ class meshWriter
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         meshWriter(const meshWriter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const meshWriter&) = delete;
 
 
diff --git a/src/conversion/ensight/mesh/ensightMesh.H b/src/conversion/ensight/mesh/ensightMesh.H
index 0c16af5f0a..ee4bed65ed 100644
--- a/src/conversion/ensight/mesh/ensightMesh.H
+++ b/src/conversion/ensight/mesh/ensightMesh.H
@@ -247,10 +247,10 @@ private:
         ) const;
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         ensightMesh(const ensightMesh&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ensightMesh&) = delete;
 
 
diff --git a/src/conversion/ensight/output/ensightOutput.H b/src/conversion/ensight/output/ensightOutput.H
index 168b11d5e0..2649fd5b76 100644
--- a/src/conversion/ensight/output/ensightOutput.H
+++ b/src/conversion/ensight/output/ensightOutput.H
@@ -113,15 +113,14 @@ class ensightOutput
         ensightFile& os
     );
 
-
-    //- Disallow null constructor
+    //- No null constructor
     ensightOutput() = delete;
 
+
 public:
 
     // Public Methods
 
-
     //- Write volume field component-wise
     template<class Type>
     static bool writeField
diff --git a/src/conversion/ensight/output/ensightSerialOutput.H b/src/conversion/ensight/output/ensightSerialOutput.H
index 22c47bf3be..5fa1c359d3 100644
--- a/src/conversion/ensight/output/ensightSerialOutput.H
+++ b/src/conversion/ensight/output/ensightSerialOutput.H
@@ -64,10 +64,10 @@ class ensightSerialOutput
         ensightFile& os
     );
 
-
-    //- Disallow null constructor
+    //- No null constructor
     ensightSerialOutput() = delete;
 
+
 public:
 
     // Public Methods
diff --git a/src/conversion/ensight/part/ensightPart.H b/src/conversion/ensight/part/ensightPart.H
index 0a7f8d2679..57ddcf5efc 100644
--- a/src/conversion/ensight/part/ensightPart.H
+++ b/src/conversion/ensight/part/ensightPart.H
@@ -67,10 +67,10 @@ class ensightPart
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         ensightPart(const ensightPart&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ensightPart&) = delete;
 
 
diff --git a/src/conversion/ensight/part/ensightPartCells.H b/src/conversion/ensight/part/ensightPartCells.H
index f256a4800f..0936f90ca6 100644
--- a/src/conversion/ensight/part/ensightPartCells.H
+++ b/src/conversion/ensight/part/ensightPartCells.H
@@ -74,10 +74,10 @@ class ensightPartCells
         ) const;
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         ensightPartCells(const ensightPartCells&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ensightPartCells&) = delete;
 
 
diff --git a/src/conversion/ensight/part/ensightPartFaces.H b/src/conversion/ensight/part/ensightPartFaces.H
index bdb6c062c8..71572d3183 100644
--- a/src/conversion/ensight/part/ensightPartFaces.H
+++ b/src/conversion/ensight/part/ensightPartFaces.H
@@ -97,10 +97,10 @@ class ensightPartFaces
         ) const;
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         ensightPartFaces(const ensightPartFaces&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ensightPartFaces&) = delete;
 
 
diff --git a/src/conversion/ensight/part/ensightParts.H b/src/conversion/ensight/part/ensightParts.H
index e51e531357..d68b21e8a3 100644
--- a/src/conversion/ensight/part/ensightParts.H
+++ b/src/conversion/ensight/part/ensightParts.H
@@ -56,10 +56,10 @@ class ensightParts
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         ensightParts(const ensightParts&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ensightParts&) = delete;
 
 
diff --git a/src/conversion/fire/FIREMeshWriter.H b/src/conversion/fire/FIREMeshWriter.H
index 2ead656b52..d4dfe98ede 100644
--- a/src/conversion/fire/FIREMeshWriter.H
+++ b/src/conversion/fire/FIREMeshWriter.H
@@ -69,10 +69,10 @@ class FIREMeshWriter
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         FIREMeshWriter(const FIREMeshWriter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const FIREMeshWriter&) = delete;
 
         //- Write points, faces, cells
diff --git a/src/conversion/polyDualMesh/polyDualMesh.H b/src/conversion/polyDualMesh/polyDualMesh.H
index fb332f7f21..de9524038b 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.H
+++ b/src/conversion/polyDualMesh/polyDualMesh.H
@@ -147,11 +147,11 @@ class polyDualMesh
         );
 
 
-        //- Disallow default bitwise copy construct
-        polyDualMesh(const polyDualMesh&);
+        //- No copy construct
+        polyDualMesh(const polyDualMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const polyDualMesh&);
+        //- No copy assignment
+        void operator=(const polyDualMesh&) = delete;
 
 
 public:
diff --git a/src/conversion/starcd/STARCDMeshReader.H b/src/conversion/starcd/STARCDMeshReader.H
index 048e309128..16abef7a10 100644
--- a/src/conversion/starcd/STARCDMeshReader.H
+++ b/src/conversion/starcd/STARCDMeshReader.H
@@ -73,10 +73,10 @@ class STARCDMeshReader
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         STARCDMeshReader(const STARCDMeshReader&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const STARCDMeshReader&) = delete;
 
 
diff --git a/src/conversion/starcd/STARCDMeshWriter.H b/src/conversion/starcd/STARCDMeshWriter.H
index f7ad1d4501..5838c2b940 100644
--- a/src/conversion/starcd/STARCDMeshWriter.H
+++ b/src/conversion/starcd/STARCDMeshWriter.H
@@ -78,10 +78,10 @@ class STARCDMeshWriter
         label findDefaultBoundary() const;
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         STARCDMeshWriter(const STARCDMeshWriter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const STARCDMeshWriter&) = delete;
 
 
diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.H b/src/conversion/vtk/output/foamVtkInternalWriter.H
index f793adab1f..802ec4c6e1 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriter.H
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.H
@@ -93,10 +93,10 @@ class internalWriter
         void writeMesh();
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         internalWriter(const internalWriter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const internalWriter&) = delete;
 
 
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.H b/src/conversion/vtk/output/foamVtkPatchWriter.H
index e7bcd15dbe..86f1676a46 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.H
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.H
@@ -98,10 +98,10 @@ class patchWriter
         void writeMesh();
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         patchWriter(const patchWriter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const patchWriter&) = delete;
 
 
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
index feb241f134..2963e3c665 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
@@ -89,10 +89,10 @@ class surfaceMeshWriter
         void writeMesh();
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         surfaceMeshWriter(const surfaceMeshWriter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const surfaceMeshWriter&) = delete;
 
 public:
diff --git a/src/conversion/vtk/part/foamVtuCells.H b/src/conversion/vtk/part/foamVtuCells.H
index 3c79ce8a33..67381ed60e 100644
--- a/src/conversion/vtk/part/foamVtuCells.H
+++ b/src/conversion/vtk/part/foamVtuCells.H
@@ -108,10 +108,10 @@ class vtuCells
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         vtuCells(const vtuCells&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const vtuCells&) = delete;
 
 
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
index a65a8160b7..402fe7719e 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
@@ -57,10 +57,10 @@ class dynamicFvMesh
 {
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         dynamicFvMesh(const dynamicFvMesh&) = delete;
 
-        //- Disallow copy assignment
+        //- No copy assignment
         void operator=(const dynamicFvMesh&) = delete;
 
 
diff --git a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H
index e2e0d0b627..3455ef0578 100644
--- a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H
+++ b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H
@@ -70,11 +70,11 @@ class dynamicInkJetFvMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        dynamicInkJetFvMesh(const dynamicInkJetFvMesh&);
+        //- No copy construct
+        dynamicInkJetFvMesh(const dynamicInkJetFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dynamicInkJetFvMesh&);
+        //- No copy assignment
+        void operator=(const dynamicInkJetFvMesh&) = delete;
 
 
 public:
diff --git a/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H b/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H
index 5c36dc13fc..84fd7b5649 100644
--- a/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H
+++ b/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H
@@ -59,11 +59,11 @@ class dynamicMotionSolverFvMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        dynamicMotionSolverFvMesh(const dynamicMotionSolverFvMesh&);
+        //- No copy construct
+        dynamicMotionSolverFvMesh(const dynamicMotionSolverFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dynamicMotionSolverFvMesh&);
+        //- No copy assignment
+        void operator=(const dynamicMotionSolverFvMesh&) = delete;
 
 
 public:
diff --git a/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.H b/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.H
index e638bf63b4..136de99e03 100644
--- a/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.H
+++ b/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.H
@@ -59,11 +59,14 @@ class dynamicMotionSolverListFvMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        dynamicMotionSolverListFvMesh(const dynamicMotionSolverListFvMesh&);
+        //- No copy construct
+        dynamicMotionSolverListFvMesh
+        (
+            const dynamicMotionSolverListFvMesh&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dynamicMotionSolverListFvMesh&);
+        //- No copy assignment
+        void operator=(const dynamicMotionSolverListFvMesh&) = delete;
 
 
 public:
diff --git a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.H b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.H
index d4906ed40d..b2525708ea 100644
--- a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.H
+++ b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.H
@@ -66,11 +66,14 @@ class dynamicMultiMotionSolverFvMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        dynamicMultiMotionSolverFvMesh(const dynamicMultiMotionSolverFvMesh&);
+        //- No copy construct
+        dynamicMultiMotionSolverFvMesh
+        (
+            const dynamicMultiMotionSolverFvMesh&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dynamicMultiMotionSolverFvMesh&);
+        //- No copy assignment
+        void operator=(const dynamicMultiMotionSolverFvMesh&) = delete;
 
 
 public:
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
index 8010b57bd1..dc3443e9c1 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
@@ -188,11 +188,11 @@ protected:
 
 private:
 
-        //- Disallow default bitwise copy construct
-        dynamicRefineFvMesh(const dynamicRefineFvMesh&);
+        //- No copy construct
+        dynamicRefineFvMesh(const dynamicRefineFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dynamicRefineFvMesh&);
+        //- No copy assignment
+        void operator=(const dynamicRefineFvMesh&) = delete;
 
 public:
 
diff --git a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
index 88120aef5c..f43029b5e5 100644
--- a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
+++ b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
@@ -52,11 +52,11 @@ class staticFvMesh
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        staticFvMesh(const staticFvMesh&);
+        //- No copy construct
+        staticFvMesh(const staticFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const staticFvMesh&);
+        //- No copy assignment
+        void operator=(const staticFvMesh&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/attachDetach/attachDetach.H b/src/dynamicMesh/attachDetach/attachDetach.H
index 6a5c03c27c..e6af62b6d6 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.H
+++ b/src/dynamicMesh/attachDetach/attachDetach.H
@@ -107,11 +107,11 @@ class attachDetach
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        attachDetach(const attachDetach&);
+        //- No copy construct
+        attachDetach(const attachDetach&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const attachDetach&);
+        //- No copy assignment
+        void operator=(const attachDetach&) = delete;
 
         //- Check validity of construction data
         void checkDefinition();
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.H b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
index 4e07939dd2..4e0701ddae 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.H
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
@@ -172,11 +172,11 @@ class boundaryMesh
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        boundaryMesh(const boundaryMesh&);
+        //- No copy construct
+        boundaryMesh(const boundaryMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const boundaryMesh&);
+        //- No copy assignment
+        void operator=(const boundaryMesh&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/createShellMesh/createShellMesh.H b/src/dynamicMesh/createShellMesh/createShellMesh.H
index ab6b4cbefc..bff1bac2c6 100644
--- a/src/dynamicMesh/createShellMesh/createShellMesh.H
+++ b/src/dynamicMesh/createShellMesh/createShellMesh.H
@@ -96,11 +96,11 @@ class createShellMesh
         );
 
 
-        //- Disallow default bitwise copy construct
-        createShellMesh(const createShellMesh&);
+        //- No copy construct
+        createShellMesh(const createShellMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const createShellMesh&);
+        //- No copy assignment
+        void operator=(const createShellMesh&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index 752dab3045..38e79de250 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
@@ -314,11 +314,11 @@ class fvMeshDistribute
                 const dictionary& fieldDicts
             );
 
-            //- Disallow default bitwise copy construct
-            fvMeshDistribute(const fvMeshDistribute&);
+            //- No copy construct
+            fvMeshDistribute(const fvMeshDistribute&) = delete;
 
-            //- Disallow default bitwise assignment
-            void operator=(const fvMeshDistribute&);
+            //- No copy assignment
+            void operator=(const fvMeshDistribute&) = delete;
 
 public:
 
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
index 8e49da9f1f..0abe59a12a 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
@@ -136,11 +136,11 @@ private:
             const label currentRegion
         ) const;
 
-        //- Disallow default bitwise copy construct
-        fvMeshSubset(const fvMeshSubset&);
+        //- No copy construct
+        fvMeshSubset(const fvMeshSubset&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvMeshSubset&);
+        //- No copy assignment
+        void operator=(const fvMeshSubset&) = delete;
 
 public:
 
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
index edb3218eae..2a2e14c259 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
@@ -88,11 +88,11 @@ class layerAdditionRemoval
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        layerAdditionRemoval(const layerAdditionRemoval&);
+        //- No copy construct
+        layerAdditionRemoval(const layerAdditionRemoval&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const layerAdditionRemoval&);
+        //- No copy assignment
+        void operator=(const layerAdditionRemoval&) = delete;
 
         //- Check validity of construction data
         void checkDefinition();
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
index 473a4a15b7..526a1cf80a 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
@@ -454,11 +454,11 @@ class cellCuts
             void check() const;
 
 
-        //- Disallow default bitwise copy construct
-        cellCuts(const cellCuts&);
+        //- No copy construct
+        cellCuts(const cellCuts&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellCuts&);
+        //- No copy assignment
+        void operator=(const cellCuts&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
index 0309557b50..1daebc8170 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
@@ -108,11 +108,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellLooper(const cellLooper&);
+        //- No copy construct
+        cellLooper(const cellLooper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellLooper&);
+        //- No copy assignment
+        void operator=(const cellLooper&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
index e34450e98e..59a60ca2aa 100644
--- a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
@@ -112,11 +112,11 @@ class geomCellLooper
         bool edgeEndsCut(const labelList&, const label index) const;
 
 
-        //- Disallow default bitwise copy construct
-        geomCellLooper(const geomCellLooper&);
+        //- No copy construct
+        geomCellLooper(const geomCellLooper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const geomCellLooper&);
+        //- No copy assignment
+        void operator=(const geomCellLooper&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
index 41cb01a838..405f9d3bbf 100644
--- a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
@@ -97,11 +97,11 @@ private:
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        hexCellLooper(const hexCellLooper&);
+        //- No copy construct
+        hexCellLooper(const hexCellLooper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const hexCellLooper&);
+        //- No copy assignment
+        void operator=(const hexCellLooper&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
index fbe3417287..a81be0b796 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
@@ -144,11 +144,11 @@ class topoCellLooper
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        topoCellLooper(const topoCellLooper&);
+        //- No copy construct
+        topoCellLooper(const topoCellLooper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const topoCellLooper&);
+        //- No copy assignment
+        void operator=(const topoCellLooper&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/meshCut/directions/directions.H b/src/dynamicMesh/meshCut/directions/directions.H
index b667aeb7f2..be018c8b25 100644
--- a/src/dynamicMesh/meshCut/directions/directions.H
+++ b/src/dynamicMesh/meshCut/directions/directions.H
@@ -126,11 +126,11 @@ private:
             const vector& defaultDir
         );
 
-        //- Disallow default bitwise copy construct
-        directions(const directions&);
+        //- No copy construct
+        directions(const directions&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const directions&);
+        //- No copy assignment
+        void operator=(const directions&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
index 711b5c8194..6286ff0a98 100644
--- a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
+++ b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
@@ -60,11 +60,11 @@ class edgeVertex
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        edgeVertex(const edgeVertex&);
+        //- No copy construct
+        edgeVertex(const edgeVertex&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const edgeVertex&);
+        //- No copy assignment
+        void operator=(const edgeVertex&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
index e3c75c5511..00bdfc1e26 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
@@ -111,11 +111,11 @@ class boundaryCutter
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        boundaryCutter(const boundaryCutter&);
+        //- No copy construct
+        boundaryCutter(const boundaryCutter&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const boundaryCutter&);
+        //- No copy assignment
+        void operator=(const boundaryCutter&) = delete;
 
 public:
 
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
index a73123c5db..dbd9a5581e 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
@@ -176,11 +176,11 @@ class meshCutAndRemove
 
 
 
-        //- Disallow default bitwise copy construct
-        meshCutAndRemove(const meshCutAndRemove&);
+        //- No copy construct
+        meshCutAndRemove(const meshCutAndRemove&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const meshCutAndRemove&);
+        //- No copy assignment
+        void operator=(const meshCutAndRemove&) = delete;
 
 public:
 
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
index b48d57d260..6877805441 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
@@ -258,11 +258,11 @@ class meshCutter
 
 
 
-        //- Disallow default bitwise copy construct
-        meshCutter(const meshCutter&);
+        //- No copy construct
+        meshCutter(const meshCutter&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const meshCutter&);
+        //- No copy assignment
+        void operator=(const meshCutter&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H
index bf14814980..e8c475cdc7 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H
@@ -138,11 +138,11 @@ class multiDirRefinement
         );
 
 
-        //- Disallow default bitwise copy construct
-        multiDirRefinement(const multiDirRefinement&);
+        //- No copy construct
+        multiDirRefinement(const multiDirRefinement&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const multiDirRefinement&);
+        //- No copy assignment
+        void operator=(const multiDirRefinement&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
index d9b5ca2f15..d0da1a8eed 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
@@ -128,11 +128,11 @@ class undoableMeshCutter
         static void updateLabels(const labelList& map, Map<splitCell*>&);
 
 
-        //- Disallow default bitwise copy construct
-        undoableMeshCutter(const undoableMeshCutter&);
+        //- No copy construct
+        undoableMeshCutter(const undoableMeshCutter&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const undoableMeshCutter&);
+        //- No copy assignment
+        void operator=(const undoableMeshCutter&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/meshCut/splitCell/splitCell.H b/src/dynamicMesh/meshCut/splitCell/splitCell.H
index 717e1700ff..3f246d9328 100644
--- a/src/dynamicMesh/meshCut/splitCell/splitCell.H
+++ b/src/dynamicMesh/meshCut/splitCell/splitCell.H
@@ -68,11 +68,11 @@ class splitCell
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        splitCell(const splitCell&);
+        //- No copy construct
+        splitCell(const splitCell&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const splitCell&);
+        //- No copy assignment
+        void operator=(const splitCell&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.H b/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.H
index f531535e79..0244d098e3 100644
--- a/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.H
+++ b/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.H
@@ -82,10 +82,10 @@ public:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         meshSubsetHelper(const meshSubsetHelper&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const meshSubsetHelper&) = delete;
 
 
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
index b979ba08db..b6b85974fe 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
@@ -287,11 +287,11 @@ class motionSmootherAlgo
             bitSet& isAffectedPoint
         ) const;
 
-        //- Disallow default bitwise copy construct
-        motionSmootherAlgo(const motionSmootherAlgo&);
+        //- No copy construct
+        motionSmootherAlgo(const motionSmootherAlgo&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const motionSmootherAlgo&);
+        //- No copy assignment
+        void operator=(const motionSmootherAlgo&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H
index 8f960cbb8e..96eca5e788 100644
--- a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H
@@ -80,14 +80,14 @@ private:
         //- Return the component corresponding to the given component name
         direction cmpt(const word& cmptName) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         componentDisplacementMotionSolver
         (
             const componentDisplacementMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const componentDisplacementMotionSolver&);
+        //- No copy assignment
+        void operator=(const componentDisplacementMotionSolver&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H
index cbc7ab3a9e..4171cedc9a 100644
--- a/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H
@@ -77,15 +77,14 @@ private:
         //- Return the component corresponding to the given component name
         direction cmpt(const word& cmptName) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         componentVelocityMotionSolver
         (
             const componentVelocityMotionSolver&
-        );
-
-        //- Disallow default bitwise assignment
-        void operator=(const componentVelocityMotionSolver&);
+        ) = delete;
 
+        //- No copy assignment
+        void operator=(const componentVelocityMotionSolver&) = delete;
 
 public:
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H
index eb6e585f29..6dcfa2f445 100644
--- a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.H
@@ -65,11 +65,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        displacementMotionSolver(const displacementMotionSolver&);
+        //- No copy construct
+        displacementMotionSolver(const displacementMotionSolver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const displacementMotionSolver&);
+        //- No copy assignment
+        void operator=(const displacementMotionSolver&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
index 785aa25cca..41d0e012ea 100644
--- a/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
@@ -92,14 +92,14 @@ class displacementInterpolationMotionSolver
         //- Read settings
         void calcInterpolation();
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementInterpolationMotionSolver
         (
             const displacementInterpolationMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const displacementInterpolationMotionSolver&);
+        //- No copy assignment
+        void operator=(const displacementInterpolationMotionSolver&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
index 99986a19d8..98e1e69155 100644
--- a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
@@ -114,14 +114,14 @@ class displacementLayeredMotionMotionSolver
         );
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementLayeredMotionMotionSolver
         (
             const displacementLayeredMotionMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const displacementLayeredMotionMotionSolver&);
+        //- No copy assignment
+        void operator=(const displacementLayeredMotionMotionSolver&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H
index 18041f268f..70d5da3089 100644
--- a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H
@@ -67,11 +67,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        points0MotionSolver(const points0MotionSolver&);
+        //- No copy construct
+        points0MotionSolver(const points0MotionSolver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const points0MotionSolver&);
+        //- No copy assignment
+        void operator=(const points0MotionSolver&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.H
index 14232574ac..a15528f09b 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.H
@@ -66,11 +66,11 @@ class multiSolidBodyMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        multiSolidBodyMotionSolver(const multiSolidBodyMotionSolver&);
+        //- No copy construct
+        multiSolidBodyMotionSolver(const multiSolidBodyMotionSolver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const multiSolidBodyMotionSolver&);
+        //- No copy assignment
+        void operator=(const multiSolidBodyMotionSolver&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H
index 9c294be805..bc8dc4025b 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H
@@ -96,11 +96,11 @@ class SDA
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        SDA(const SDA&);
+        //- No copy construct
+        SDA(const SDA&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const SDA&);
+        //- No copy assignment
+        void operator=(const SDA&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H
index 8cbd3e8ce6..1faba27914 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H
@@ -66,11 +66,11 @@ class axisRotationMotion
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        axisRotationMotion(const axisRotationMotion&);
+        //- No copy construct
+        axisRotationMotion(const axisRotationMotion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const axisRotationMotion&);
+        //- No copy assignment
+        void operator=(const axisRotationMotion&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H
index afc90d7442..fac465bd51 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H
@@ -62,11 +62,11 @@ class linearMotion
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        linearMotion(const linearMotion&);
+        //- No copy construct
+        linearMotion(const linearMotion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const linearMotion&);
+        //- No copy assignment
+        void operator=(const linearMotion&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H
index 47ce23cc5a..7f9556ebfd 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H
@@ -62,11 +62,11 @@ class multiMotion
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        multiMotion(const multiMotion&);
+        //- No copy construct
+        multiMotion(const multiMotion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const multiMotion&);
+        //- No copy assignment
+        void operator=(const multiMotion&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
index ef0ea54fd8..9bd4a2498b 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
@@ -65,11 +65,11 @@ class oscillatingLinearMotion
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        oscillatingLinearMotion(const oscillatingLinearMotion&);
+        //- No copy construct
+        oscillatingLinearMotion(const oscillatingLinearMotion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const oscillatingLinearMotion&);
+        //- No copy assignment
+        void operator=(const oscillatingLinearMotion&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
index 198796c613..6400622fa5 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
@@ -68,11 +68,11 @@ class oscillatingRotatingMotion
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        oscillatingRotatingMotion(const oscillatingRotatingMotion&);
+        //- No copy construct
+        oscillatingRotatingMotion(const oscillatingRotatingMotion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const oscillatingRotatingMotion&);
+        //- No copy assignment
+        void operator=(const oscillatingRotatingMotion&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
index 720f46ad66..586259cb1d 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
@@ -73,11 +73,11 @@ class rotatingMotion
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        rotatingMotion(const rotatingMotion&);
+        //- No copy construct
+        rotatingMotion(const rotatingMotion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const rotatingMotion&);
+        //- No copy assignment
+        void operator=(const rotatingMotion&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
index 232ce1b4cc..5609af24b8 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
@@ -72,11 +72,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        solidBodyMotionFunction(const solidBodyMotionFunction&);
+        //- No copy construct
+        solidBodyMotionFunction(const solidBodyMotionFunction&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const solidBodyMotionFunction&);
+        //- No copy assignment
+        void operator=(const solidBodyMotionFunction&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
index 4c6c05b4f1..7a8125880f 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
@@ -78,11 +78,11 @@ class tabulated6DoFMotion
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        tabulated6DoFMotion(const tabulated6DoFMotion&);
+        //- No copy construct
+        tabulated6DoFMotion(const tabulated6DoFMotion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const tabulated6DoFMotion&);
+        //- No copy assignment
+        void operator=(const tabulated6DoFMotion&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver.H
index 4b36558c2c..dd300a7e2b 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionSolver.H
@@ -66,11 +66,11 @@ class solidBodyMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        solidBodyMotionSolver(const solidBodyMotionSolver&);
+        //- No copy construct
+        solidBodyMotionSolver(const solidBodyMotionSolver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const solidBodyMotionSolver&);
+        //- No copy assignment
+        void operator=(const solidBodyMotionSolver&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/motionSolvers/velocity/velocityDisplacement/velocityDisplacementMotionSolver.H b/src/dynamicMesh/motionSolvers/velocity/velocityDisplacement/velocityDisplacementMotionSolver.H
index 7578886871..4773b33c14 100644
--- a/src/dynamicMesh/motionSolvers/velocity/velocityDisplacement/velocityDisplacementMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/velocity/velocityDisplacement/velocityDisplacementMotionSolver.H
@@ -62,14 +62,14 @@ class velocityDisplacementMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         velocityDisplacementMotionSolver
         (
             const velocityDisplacementMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const velocityDisplacementMotionSolver&);
+        //- No copy assignment
+        void operator=(const velocityDisplacementMotionSolver&) = delete;
 
         //- Get the boundary condition types for the point displacement
         wordList pointDisplacementBoundaryTypes() const;
diff --git a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
index e675b87d73..ce20a29994 100644
--- a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
@@ -67,14 +67,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        velocityMotionSolver
-        (
-            const velocityMotionSolver&
-        );
+        //- No copy construct
+        velocityMotionSolver(const velocityMotionSolver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const velocityMotionSolver&);
+        //- No copy assignment
+        void operator=(const velocityMotionSolver&) = delete;
 
 public:
 
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.H b/src/dynamicMesh/perfectInterface/perfectInterface.H
index 4003e2fe17..8adbb7fd55 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.H
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.H
@@ -78,11 +78,11 @@ class perfectInterface
         static pointField calcFaceCentres(const indirectPrimitivePatch&);
 
 
-        //- Disallow default bitwise copy construct
-        perfectInterface(const perfectInterface&);
+        //- No copy construct
+        perfectInterface(const perfectInterface&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const perfectInterface&);
+        //- No copy assignment
+        void operator=(const perfectInterface&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/pointPatchDist/pointPatchDist.H b/src/dynamicMesh/pointPatchDist/pointPatchDist.H
index 6a806fa46d..02ed70ca72 100644
--- a/src/dynamicMesh/pointPatchDist/pointPatchDist.H
+++ b/src/dynamicMesh/pointPatchDist/pointPatchDist.H
@@ -69,11 +69,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointPatchDist(const pointPatchDist&);
+        //- No copy construct
+        pointPatchDist(const pointPatchDist&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointPatchDist&);
+        //- No copy assignment
+        void operator=(const pointPatchDist&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
index 8627838994..2a6896d4ab 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
@@ -186,11 +186,11 @@ class polyMeshFilter
             labelList& origToCurrentPointMap
         ) const;
 
-        //- Disallow default bitwise copy construct
-        polyMeshFilter(const polyMeshFilter&);
+        //- No copy construct
+        polyMeshFilter(const polyMeshFilter&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const polyMeshFilter&);
+        //- No copy assignment
+        void operator=(const polyMeshFilter&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H
index ca13143c99..e73b4cf68d 100644
--- a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H
+++ b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H
@@ -65,11 +65,11 @@ class attachPolyTopoChanger
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        attachPolyTopoChanger(const attachPolyTopoChanger&);
+        //- No copy construct
+        attachPolyTopoChanger(const attachPolyTopoChanger&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const attachPolyTopoChanger&);
+        //- No copy assignment
+        void operator=(const attachPolyTopoChanger&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
index aadf811f3e..a658b3297d 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
@@ -86,11 +86,11 @@ class polyMeshModifier
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        polyMeshModifier(const polyMeshModifier&);
+        //- No copy construct
+        polyMeshModifier(const polyMeshModifier&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const polyMeshModifier&);
+        //- No copy assignment
+        void operator=(const polyMeshModifier&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
index 9e6e2235cc..b418080299 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
@@ -279,11 +279,11 @@ class addPatchCellLayer
             bool& zoneFlip
         );
 
-        //- Disallow default bitwise copy construct
-        addPatchCellLayer(const addPatchCellLayer&);
+        //- No copy construct
+        addPatchCellLayer(const addPatchCellLayer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const addPatchCellLayer&);
+        //- No copy assignment
+        void operator=(const addPatchCellLayer&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
index c02b26a336..d137b2cb87 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
@@ -115,11 +115,11 @@ class combineFaces
 
 
 
-        //- Disallow default bitwise copy construct
-        combineFaces(const combineFaces&);
+        //- No copy construct
+        combineFaces(const combineFaces&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const combineFaces&);
+        //- No copy assignment
+        void operator=(const combineFaces&) = delete;
 
 public:
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H
index 8db358ac62..5cb77f2a81 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H
@@ -70,11 +70,11 @@ class duplicatePoints
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        duplicatePoints(const duplicatePoints&);
+        //- No copy construct
+        duplicatePoints(const duplicatePoints&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const duplicatePoints&);
+        //- No copy assignment
+        void operator=(const duplicatePoints&) = delete;
 
 public:
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
index 6bf2faeb30..e85055d844 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
@@ -236,11 +236,11 @@ private:
             face& f
         ) const;
 
-        //- Disallow default bitwise copy construct
-        edgeCollapser(const edgeCollapser&);
+        //- No copy construct
+        edgeCollapser(const edgeCollapser&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const edgeCollapser&);
+        //- No copy assignment
+        void operator=(const edgeCollapser&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H
index 4e610928c8..c84028eceb 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H
@@ -112,11 +112,11 @@ class faceCollapser
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        faceCollapser(const faceCollapser&);
+        //- No copy construct
+        faceCollapser(const faceCollapser&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faceCollapser&);
+        //- No copy assignment
+        void operator=(const faceCollapser&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
index 3f4292d527..0f57a51f8c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
@@ -341,11 +341,11 @@ class hexRef8
             ) const;
 
 
-        //- Disallow default bitwise copy construct
-        hexRef8(const hexRef8&);
+        //- No copy construct
+        hexRef8(const hexRef8&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const hexRef8&);
+        //- No copy assignment
+        void operator=(const hexRef8&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
index 48c50db72e..913e46b5f3 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
@@ -73,11 +73,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        hexRef8Data(const hexRef8Data&);
+        //- No copy construct
+        hexRef8Data(const hexRef8Data&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const hexRef8Data&);
+        //- No copy assignment
+        void operator=(const hexRef8Data&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H
index a4ccf9b154..a598c6a3bd 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H
@@ -156,11 +156,11 @@ class removeFaces
 
 
 
-        //- Disallow default bitwise copy construct
-        removeFaces(const removeFaces&);
+        //- No copy construct
+        removeFaces(const removeFaces&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const removeFaces&);
+        //- No copy assignment
+        void operator=(const removeFaces&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
index 25f4c7dad4..9f4530e121 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
@@ -90,11 +90,11 @@ class removePoints
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        removePoints(const removePoints&);
+        //- No copy construct
+        removePoints(const removePoints&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const removePoints&);
+        //- No copy assignment
+        void operator=(const removePoints&) = delete;
 
 public:
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
index 2de77c48c9..7bc338f331 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
@@ -126,11 +126,11 @@ private:
         //- Work out triangle index given the starting vertex in the face
         label triIndex(const label facei, const label fp) const;
 
-        //- Disallow default bitwise copy construct
-        tetDecomposer(const tetDecomposer&);
+        //- No copy construct
+        tetDecomposer(const tetDecomposer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const tetDecomposer&);
+        //- No copy assignment
+        void operator=(const tetDecomposer&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
index 94ff7bea97..44611cf460 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
@@ -71,10 +71,10 @@ class polyTopoChanger
 
         void readModifiers();
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         polyTopoChanger(const polyTopoChanger&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const polyTopoChanger&) = delete;
 
 
diff --git a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
index 5f0e6c4637..2afb9982a0 100644
--- a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
+++ b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
@@ -65,11 +65,11 @@ class repatchPolyTopoChanger
         //- Demand driven access to polyTopoChange
         polyTopoChange& meshMod();
 
-        //- Disallow default bitwise copy construct
-        repatchPolyTopoChanger(const repatchPolyTopoChanger&);
+        //- No copy construct
+        repatchPolyTopoChanger(const repatchPolyTopoChanger&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const repatchPolyTopoChanger&);
+        //- No copy assignment
+        void operator=(const repatchPolyTopoChanger&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/setUpdater/setUpdater.H b/src/dynamicMesh/setUpdater/setUpdater.H
index f9d14353d0..31fbe18dd7 100644
--- a/src/dynamicMesh/setUpdater/setUpdater.H
+++ b/src/dynamicMesh/setUpdater/setUpdater.H
@@ -58,11 +58,11 @@ class setUpdater
         template<class Type>
         void updateSets(const mapPolyMesh& morphMap) const;
 
-        //- Disallow default bitwise copy construct
-        setUpdater(const setUpdater&);
+        //- No copy construct
+        setUpdater(const setUpdater&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const setUpdater&);
+        //- No copy assignment
+        void operator=(const setUpdater&) = delete;
 
 
 public:
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
index 12430c03e6..5de26b9184 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
@@ -132,10 +132,10 @@ class enrichedPatch
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         enrichedPatch(const enrichedPatch&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const enrichedPatch&) = delete;
 
         // Creation of demand-driven private data
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.H b/src/dynamicMesh/slidingInterface/slidingInterface.H
index c7f0383942..0747f4e341 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.H
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.H
@@ -209,11 +209,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        slidingInterface(const slidingInterface&);
+        //- No copy construct
+        slidingInterface(const slidingInterface&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const slidingInterface&);
+        //- No copy assignment
+        void operator=(const slidingInterface&) = delete;
 
         //- Clear out
         void clearOut() const;
diff --git a/src/engine/engineMesh/engineMesh/engineMesh.H b/src/engine/engineMesh/engineMesh/engineMesh.H
index cdd32c1fde..d9fdf359ef 100644
--- a/src/engine/engineMesh/engineMesh/engineMesh.H
+++ b/src/engine/engineMesh/engineMesh/engineMesh.H
@@ -57,11 +57,11 @@ class engineMesh
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        engineMesh(const engineMesh&);
+        //- No copy construct
+        engineMesh(const engineMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const engineMesh&);
+        //- No copy assignment
+        void operator=(const engineMesh&) = delete;
 
 
 protected:
diff --git a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H
index a8094ce231..93c142ed96 100644
--- a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H
+++ b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H
@@ -63,11 +63,11 @@ class fvMotionSolverEngineMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fvMotionSolverEngineMesh(const fvMotionSolverEngineMesh&);
+        //- No copy construct
+        fvMotionSolverEngineMesh(const fvMotionSolverEngineMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvMotionSolverEngineMesh&);
+        //- No copy assignment
+        void operator=(const fvMotionSolverEngineMesh&) = delete;
 
 
 public:
diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
index c22388ede4..cd256cfa9a 100644
--- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
+++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
@@ -58,11 +58,11 @@ class layeredEngineMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        layeredEngineMesh(const layeredEngineMesh&);
+        //- No copy construct
+        layeredEngineMesh(const layeredEngineMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const layeredEngineMesh&);
+        //- No copy assignment
+        void operator=(const layeredEngineMesh&) = delete;
 
 
 public:
diff --git a/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H b/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H
index e87dc355a2..79f3dee742 100644
--- a/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H
+++ b/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H
@@ -52,11 +52,11 @@ class staticEngineMesh
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        staticEngineMesh(const staticEngineMesh&);
+        //- No copy construct
+        staticEngineMesh(const staticEngineMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const staticEngineMesh&);
+        //- No copy assignment
+        void operator=(const staticEngineMesh&) = delete;
 
 
 public:
diff --git a/src/engine/enginePiston/enginePiston.H b/src/engine/enginePiston/enginePiston.H
index 1cf9c5bde7..03c2291216 100644
--- a/src/engine/enginePiston/enginePiston.H
+++ b/src/engine/enginePiston/enginePiston.H
@@ -79,11 +79,11 @@ class enginePiston
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        enginePiston(const enginePiston&);
+        //- No copy construct
+        enginePiston(const enginePiston&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const enginePiston&);
+        //- No copy assignment
+        void operator=(const enginePiston&) = delete;
 
 
 public:
diff --git a/src/engine/engineTime/engineTime.H b/src/engine/engineTime/engineTime.H
index 2ccb142a12..90a3385e33 100644
--- a/src/engine/engineTime/engineTime.H
+++ b/src/engine/engineTime/engineTime.H
@@ -86,11 +86,11 @@ class engineTime
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        engineTime(const engineTime&);
+        //- No copy construct
+        engineTime(const engineTime&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const engineTime&);
+        //- No copy assignment
+        void operator=(const engineTime&) = delete;
 
         //- Adjust read time values
         void timeAdjustment();
diff --git a/src/engine/engineValve/engineValve.H b/src/engine/engineValve/engineValve.H
index be702aa9e8..e34b88f65f 100644
--- a/src/engine/engineValve/engineValve.H
+++ b/src/engine/engineValve/engineValve.H
@@ -133,11 +133,11 @@ class engineValve
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        engineValve(const engineValve&);
+        //- No copy construct
+        engineValve(const engineValve&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const engineValve&);
+        //- No copy assignment
+        void operator=(const engineValve&) = delete;
 
 
         //- Adjust crank angle to drop within the limits of the lift profile
diff --git a/src/engine/engineValve/valveBank.H b/src/engine/engineValve/valveBank.H
index b5046bf9be..8bd0c27673 100644
--- a/src/engine/engineValve/valveBank.H
+++ b/src/engine/engineValve/valveBank.H
@@ -52,11 +52,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        valveBank(const valveBank&);
+        //- No copy construct
+        valveBank(const valveBank&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const valveBank&);
+        //- No copy assignment
+        void operator=(const valveBank&) = delete;
 
 
 public:
diff --git a/src/engine/ignition/ignition.H b/src/engine/ignition/ignition.H
index eae3fda327..3982a07ad2 100644
--- a/src/engine/ignition/ignition.H
+++ b/src/engine/ignition/ignition.H
@@ -63,11 +63,11 @@ class ignition
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        ignition(const ignition&);
+        //- No copy construct
+        ignition(const ignition&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const ignition&);
+        //- No copy assignment
+        void operator=(const ignition&) = delete;
 
 
 public:
diff --git a/src/fileFormats/ensight/file/ensightFile.H b/src/fileFormats/ensight/file/ensightFile.H
index 78b09904e1..4d2592521d 100644
--- a/src/fileFormats/ensight/file/ensightFile.H
+++ b/src/fileFormats/ensight/file/ensightFile.H
@@ -73,11 +73,12 @@ class ensightFile
         //- Initialize by setting the ASCII output formatting
         void initialize();
 
-        //- Disallow default bitwise assignment
+        //- No copy construct
+        ensightFile(const ensightFile&) = delete;
+
+        //- No copy assignment
         void operator=(const ensightFile&) = delete;
 
-        //- Disallow default copy constructor
-        ensightFile(const ensightFile&) = delete;
 
 public:
 
diff --git a/src/fileFormats/ensight/file/ensightGeoFile.H b/src/fileFormats/ensight/file/ensightGeoFile.H
index 6b60c6e419..eb83526c65 100644
--- a/src/fileFormats/ensight/file/ensightGeoFile.H
+++ b/src/fileFormats/ensight/file/ensightGeoFile.H
@@ -52,12 +52,12 @@ class ensightGeoFile
         //- Initialize by outputting header information
         void initialize();
 
-        //- Disallow default bitwise assignment
-        void operator=(const ensightGeoFile&) = delete;
-
-        //- Disallow default copy constructor
+        //- No copy construct
         ensightGeoFile(const ensightGeoFile&) = delete;
 
+        //- No copy assignment
+        void operator=(const ensightGeoFile&) = delete;
+
 
 public:
 
diff --git a/src/fileFormats/ensight/part/ensightCells.H b/src/fileFormats/ensight/part/ensightCells.H
index cef7c4b2ed..8dd096dd87 100644
--- a/src/fileFormats/ensight/part/ensightCells.H
+++ b/src/fileFormats/ensight/part/ensightCells.H
@@ -100,7 +100,7 @@ private:
         //- Use temporarily stored sizes to redimension the element lists
         void resizeAll();
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ensightCells&) = delete;
 
 
diff --git a/src/fileFormats/ensight/part/ensightFaces.H b/src/fileFormats/ensight/part/ensightFaces.H
index fc9fb99658..abea086e3b 100644
--- a/src/fileFormats/ensight/part/ensightFaces.H
+++ b/src/fileFormats/ensight/part/ensightFaces.H
@@ -107,7 +107,7 @@ private:
         //- Use temporarily stored sizes to redimension the element lists
         void resizeAll();
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ensightFaces&) = delete;
 
 
diff --git a/src/fileFormats/ensight/read/ensightReadFile.H b/src/fileFormats/ensight/read/ensightReadFile.H
index aa6723352b..680056f27f 100644
--- a/src/fileFormats/ensight/read/ensightReadFile.H
+++ b/src/fileFormats/ensight/read/ensightReadFile.H
@@ -51,11 +51,11 @@ class ensightReadFile
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const ensightReadFile&);
+        //- No copy construct
+        ensightReadFile(const ensightReadFile&) = delete;
 
-        //- Disallow default copy constructor
-        ensightReadFile(const ensightReadFile&);
+        //- No copy assignment
+        void operator=(const ensightReadFile&) = delete;
 
 
 public:
diff --git a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
index 2df2e8ce50..77e3c5ee67 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAppendBase64Formatter.H
@@ -61,10 +61,10 @@ class appendBase64Formatter
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         appendBase64Formatter(const appendBase64Formatter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const appendBase64Formatter&) = delete;
 
 
diff --git a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
index 758fa8d93d..4f6d58336a 100644
--- a/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAppendRawFormatter.H
@@ -61,10 +61,10 @@ class appendRawFormatter
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         appendRawFormatter(const appendRawFormatter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const appendRawFormatter&) = delete;
 
 
diff --git a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
index bbedc55e91..588d80b58a 100644
--- a/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkAsciiFormatter.H
@@ -72,10 +72,10 @@ class asciiFormatter
         inline void done();
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         asciiFormatter(const asciiFormatter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const asciiFormatter&) = delete;
 
 
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Formatter.H b/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
index df27f23087..94a009da99 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
+++ b/src/fileFormats/vtk/format/foamVtkBase64Formatter.H
@@ -59,10 +59,10 @@ class base64Formatter
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         base64Formatter(const base64Formatter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const base64Formatter&) = delete;
 
 
diff --git a/src/fileFormats/vtk/format/foamVtkBase64Layer.H b/src/fileFormats/vtk/format/foamVtkBase64Layer.H
index 6bfa3652d4..79b5397ea5 100644
--- a/src/fileFormats/vtk/format/foamVtkBase64Layer.H
+++ b/src/fileFormats/vtk/format/foamVtkBase64Layer.H
@@ -58,10 +58,10 @@ class foamVtkBase64Layer
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         foamVtkBase64Layer(const foamVtkBase64Layer&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const foamVtkBase64Layer&) = delete;
 
 
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
index 7301ef9854..f298a545f6 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkLegacyAsciiFormatter.H
@@ -61,10 +61,10 @@ class legacyAsciiFormatter
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         legacyAsciiFormatter(const legacyAsciiFormatter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const legacyAsciiFormatter&) = delete;
 
 
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
index 3f24f05cb0..2633328676 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkLegacyRawFormatter.H
@@ -63,10 +63,10 @@ class legacyRawFormatter
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         legacyRawFormatter(const legacyRawFormatter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const legacyRawFormatter&) = delete;
 
 
diff --git a/src/fileFormats/vtk/read/vtkUnstructuredReader.H b/src/fileFormats/vtk/read/vtkUnstructuredReader.H
index bee79496c6..159fbdb730 100644
--- a/src/fileFormats/vtk/read/vtkUnstructuredReader.H
+++ b/src/fileFormats/vtk/read/vtkUnstructuredReader.H
@@ -204,8 +204,8 @@ private:
 
         void read(ISstream& inFile);
 
-        //- Disallow assignment
-        void operator=(const vtkUnstructuredReader&);
+        //- No copy assignment
+        void operator=(const vtkUnstructuredReader&) = delete;
 
 
 public:
diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
index bf7580c20c..f5a7c51b80 100644
--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
@@ -72,11 +72,11 @@ class faBoundaryMesh
         //- Reference to mesh
         const faMesh& mesh_;
 
-        //- Disallow construct as copy
-        faBoundaryMesh(const faBoundaryMesh&);
+        //- No copy construct
+        faBoundaryMesh(const faBoundaryMesh&) = delete;
 
-        //- Disallow assignment
-        void operator=(const faBoundaryMesh&);
+        //- No copy assignment
+        void operator=(const faBoundaryMesh&) = delete;
 
 
 public:
diff --git a/src/finiteArea/faMesh/faGlobalMeshData/faGlobalMeshData.H b/src/finiteArea/faMesh/faGlobalMeshData/faGlobalMeshData.H
index acfef27d3c..fe96b59aa6 100644
--- a/src/finiteArea/faMesh/faGlobalMeshData/faGlobalMeshData.H
+++ b/src/finiteArea/faMesh/faGlobalMeshData/faGlobalMeshData.H
@@ -75,11 +75,11 @@ class faGlobalMeshData
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faGlobalMeshData(const faGlobalMeshData&);
+        //- No copy construct
+        faGlobalMeshData(const faGlobalMeshData&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faGlobalMeshData&);
+        //- No copy assignment
+        void operator=(const faGlobalMeshData&) = delete;
 
 
 public:
diff --git a/src/finiteArea/faMesh/faMesh.H b/src/finiteArea/faMesh/faMesh.H
index 733dde6898..91d64fdab2 100644
--- a/src/finiteArea/faMesh/faMesh.H
+++ b/src/finiteArea/faMesh/faMesh.H
@@ -198,11 +198,11 @@ class faMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faMesh(const faMesh&);
+        //- No copy construct
+        faMesh(const faMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faMesh&);
+        //- No copy assignment
+        void operator=(const faMesh&) = delete;
 
 
         //- Set primitive mesh data
diff --git a/src/finiteArea/faMesh/faMeshLduAddressing.H b/src/finiteArea/faMesh/faMeshLduAddressing.H
index fbee4ceba8..f1077c32e1 100644
--- a/src/finiteArea/faMesh/faMeshLduAddressing.H
+++ b/src/finiteArea/faMesh/faMeshLduAddressing.H
@@ -74,11 +74,11 @@ class faMeshLduAddressing
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faMeshLduAddressing(const faMeshLduAddressing&);
+        //- No copy construct
+        faMeshLduAddressing(const faMeshLduAddressing&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faMeshLduAddressing&);
+        //- No copy assignment
+        void operator=(const faMeshLduAddressing&) = delete;
 
 
 public:
diff --git a/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H b/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H
index a12d87a6ea..e73dff11aa 100644
--- a/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H
+++ b/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H
@@ -104,11 +104,11 @@ class faAreaMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faAreaMapper(const faAreaMapper&);
+        //- No copy construct
+        faAreaMapper(const faAreaMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faAreaMapper&);
+        //- No copy assignment
+        void operator=(const faAreaMapper&) = delete;
 
         //- Calculate addressing
         void calcAddressing() const;
diff --git a/src/finiteArea/faMesh/faMeshMapper/faBoundaryMeshMapper.H b/src/finiteArea/faMesh/faMeshMapper/faBoundaryMeshMapper.H
index 304eb3d456..e9bdf9ba87 100644
--- a/src/finiteArea/faMesh/faMeshMapper/faBoundaryMeshMapper.H
+++ b/src/finiteArea/faMesh/faMeshMapper/faBoundaryMeshMapper.H
@@ -52,11 +52,11 @@ class faBoundaryMeshMapper
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faBoundaryMeshMapper(const faBoundaryMeshMapper&);
+        //- No copy construct
+        faBoundaryMeshMapper(const faBoundaryMeshMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faBoundaryMeshMapper&);
+        //- No copy assignment
+        void operator=(const faBoundaryMeshMapper&) = delete;
 
 
 public:
diff --git a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H
index a34c098806..d9c5a9a470 100644
--- a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H
+++ b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H
@@ -83,11 +83,11 @@ class faEdgeMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faEdgeMapper(const faEdgeMapper&);
+        //- No copy construct
+        faEdgeMapper(const faEdgeMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faEdgeMapper&);
+        //- No copy assignment
+        void operator=(const faEdgeMapper&) = delete;
 
         //- Calculate addressing
         void calcAddressing() const;
diff --git a/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H b/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H
index 529b60c062..cfc0eb256c 100644
--- a/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H
+++ b/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H
@@ -112,11 +112,11 @@ class faMeshMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faMeshMapper(const faMeshMapper&);
+        //- No copy construct
+        faMeshMapper(const faMeshMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faMeshMapper&);
+        //- No copy assignment
+        void operator=(const faMeshMapper&) = delete;
 
 
 public:
diff --git a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H
index f8937ed8e2..2358f73262 100644
--- a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H
+++ b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H
@@ -89,11 +89,11 @@ class faPatchMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faPatchMapper(const faPatchMapper&);
+        //- No copy construct
+        faPatchMapper(const faPatchMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faPatchMapper&);
+        //- No copy assignment
+        void operator=(const faPatchMapper&) = delete;
 
 
         //- Calculate addressing for mapping with inserted cells
diff --git a/src/finiteArea/faSolution/faSolution.H b/src/finiteArea/faSolution/faSolution.H
index 3deec19fce..7b25aa465c 100644
--- a/src/finiteArea/faSolution/faSolution.H
+++ b/src/finiteArea/faSolution/faSolution.H
@@ -57,9 +57,11 @@ class faSolution
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        faSolution(const faSolution&);
-        void operator=(const faSolution&);
+        //- No copy construct
+        faSolution(const faSolution&) = delete;
+
+        //- No copy assignment
+        void operator=(const faSolution&) = delete;
 
 
 public:
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMapperPatchRef.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMapperPatchRef.H
index a20479d391..b7c1c56e26 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMapperPatchRef.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMapperPatchRef.H
@@ -56,11 +56,11 @@ class faPatchFieldMapperPatchRef
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faPatchFieldMapperPatchRef(const faPatchFieldMapperPatchRef&);
+        //- No copy construct
+        faPatchFieldMapperPatchRef(const faPatchFieldMapperPatchRef&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faPatchFieldMapperPatchRef&);
+        //- No copy assignment
+        void operator=(const faPatchFieldMapperPatchRef&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H b/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H
index 701bc954ea..6ef43d937c 100644
--- a/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H
+++ b/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H
@@ -74,10 +74,10 @@ class convectionScheme
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         convectionScheme(const convectionScheme&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const convectionScheme&) = delete;
 
 
diff --git a/src/finiteArea/finiteArea/convectionSchemes/gaussFaConvectionScheme/gaussFaConvectionScheme.H b/src/finiteArea/finiteArea/convectionSchemes/gaussFaConvectionScheme/gaussFaConvectionScheme.H
index 54dcd9669f..55ee923cd6 100644
--- a/src/finiteArea/finiteArea/convectionSchemes/gaussFaConvectionScheme/gaussFaConvectionScheme.H
+++ b/src/finiteArea/finiteArea/convectionSchemes/gaussFaConvectionScheme/gaussFaConvectionScheme.H
@@ -67,11 +67,11 @@ class gaussConvectionScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        gaussConvectionScheme(const gaussConvectionScheme&);
+        //- No copy construct
+        gaussConvectionScheme(const gaussConvectionScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const gaussConvectionScheme&);
+        //- No copy assignment
+        void operator=(const gaussConvectionScheme&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H
index 8f026fe2b8..8d57b6649e 100644
--- a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H
+++ b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H
@@ -68,11 +68,11 @@ class EulerFaD2dt2Scheme
 		//- Return the previous time-step
 		scalar deltaT0_() const;
 
-        //- Disallow default bitwise copy construct
-        EulerFaD2dt2Scheme(const EulerFaD2dt2Scheme&);
+        //- No copy construct
+        EulerFaD2dt2Scheme(const EulerFaD2dt2Scheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const EulerFaD2dt2Scheme&);
+        //- No copy assignment
+        void operator=(const EulerFaD2dt2Scheme&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H
index c7c062eaa9..e9a09f2717 100644
--- a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H
+++ b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H
@@ -79,11 +79,11 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        faD2dt2Scheme(const faD2dt2Scheme&);
+        //- No copy construct
+        faD2dt2Scheme(const faD2dt2Scheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faD2dt2Scheme&);
+        //- No copy assignment
+        void operator=(const faD2dt2Scheme&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.H b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.H
index 6b43631ebb..e42e243db4 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.H
+++ b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.H
@@ -61,11 +61,11 @@ class EulerFaDdtScheme
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        EulerFaDdtScheme(const EulerFaDdtScheme&);
+        //- No copy construct
+        EulerFaDdtScheme(const EulerFaDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const EulerFaDdtScheme&);
+        //- No copy assignment
+        void operator=(const EulerFaDdtScheme&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.H b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.H
index 491702eebc..d567aae2ff 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.H
+++ b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.H
@@ -72,10 +72,10 @@ class backwardFaDdtScheme
         template<class GeoField>
         scalar deltaT0_(const GeoField&) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         backwardFaDdtScheme(const backwardFaDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const backwardFaDdtScheme&) = delete;
 
 
diff --git a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.H b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.H
index 5da5eb5c16..fb9ba0b825 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.H
+++ b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.H
@@ -83,11 +83,11 @@ class boundedBackwardFaDdtScheme
         }
 
 
-        //- Disallow default bitwise copy construct
-        boundedBackwardFaDdtScheme(const boundedBackwardFaDdtScheme&);
+        //- No copy construct
+        boundedBackwardFaDdtScheme(const boundedBackwardFaDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const boundedBackwardFaDdtScheme&);
+        //- No copy assignment
+        void operator=(const boundedBackwardFaDdtScheme&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H b/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H
index bffede5eb8..c20b2d5213 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H
+++ b/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H
@@ -78,11 +78,11 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        faDdtScheme(const faDdtScheme&);
+        //- No copy construct
+        faDdtScheme(const faDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faDdtScheme&);
+        //- No copy assignment
+        void operator=(const faDdtScheme&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.H b/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.H
index cba87dbdf4..b4ec92dae8 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.H
+++ b/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.H
@@ -60,10 +60,10 @@ class steadyStateFaDdtScheme
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         steadyStateFaDdtScheme(const steadyStateFaDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const steadyStateFaDdtScheme&) = delete;
 
 
diff --git a/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H b/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H
index d12cc699bc..c637120a6c 100644
--- a/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H
+++ b/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H
@@ -80,11 +80,11 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        divScheme(const divScheme&);
+        //- No copy construct
+        divScheme(const divScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const divScheme&);
+        //- No copy assignment
+        void operator=(const divScheme&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/divSchemes/gaussFaDivScheme/gaussFaDivScheme.H b/src/finiteArea/finiteArea/divSchemes/gaussFaDivScheme/gaussFaDivScheme.H
index 6b9fe22945..b11aa563fc 100644
--- a/src/finiteArea/finiteArea/divSchemes/gaussFaDivScheme/gaussFaDivScheme.H
+++ b/src/finiteArea/finiteArea/divSchemes/gaussFaDivScheme/gaussFaDivScheme.H
@@ -61,10 +61,10 @@ class gaussDivScheme
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         gaussDivScheme(const gaussDivScheme&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const gaussDivScheme&) = delete;
 
 
diff --git a/src/finiteArea/finiteArea/faSchemes/faSchemes.H b/src/finiteArea/finiteArea/faSchemes/faSchemes.H
index f074b41367..04add43040 100644
--- a/src/finiteArea/finiteArea/faSchemes/faSchemes.H
+++ b/src/finiteArea/finiteArea/faSchemes/faSchemes.H
@@ -89,11 +89,11 @@ class faSchemes
         //- Read settings from the dictionary
         void read(const dictionary&);
 
-        //- Disallow default bitwise copy construct
-        faSchemes(const faSchemes&);
+        //- No copy construct
+        faSchemes(const faSchemes&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faSchemes&);
+        //- No copy assignment
+        void operator=(const faSchemes&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H
index 96c14095de..3c4ef87896 100644
--- a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H
+++ b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H
@@ -72,10 +72,10 @@ class gradScheme
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         gradScheme(const gradScheme&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const gradScheme&) = delete;
 
 
diff --git a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H
index d99e0b1342..e942a7bdb5 100644
--- a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H
+++ b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H
@@ -69,10 +69,10 @@ class gaussGrad
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         gaussGrad(const gaussGrad&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const gaussGrad&) = delete;
 
 
diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H
index 442fa0ebc7..764ded6bce 100644
--- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H
+++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H
@@ -63,10 +63,10 @@ class leastSquaresFaGrad
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         leastSquaresFaGrad(const leastSquaresFaGrad&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const leastSquaresFaGrad&) = delete;
 
 
diff --git a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H
index 7aae1bdd1a..ab6cf391a6 100644
--- a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H
+++ b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H
@@ -82,11 +82,11 @@ class edgeLimitedGrad
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        edgeLimitedGrad(const edgeLimitedGrad&);
+        //- No copy construct
+        edgeLimitedGrad(const edgeLimitedGrad&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const edgeLimitedGrad&);
+        //- No copy assignment
+        void operator=(const edgeLimitedGrad&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H
index 34694584a3..dc65d82b95 100644
--- a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H
+++ b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H
@@ -76,11 +76,11 @@ class faceLimitedGrad
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faceLimitedGrad(const faceLimitedGrad&);
+        //- No copy construct
+        faceLimitedGrad(const faceLimitedGrad&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faceLimitedGrad&);
+        //- No copy assignment
+        void operator=(const faceLimitedGrad&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H b/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H
index 4c74c4b0a2..8f17992a96 100644
--- a/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H
+++ b/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H
@@ -82,11 +82,11 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        laplacianScheme(const laplacianScheme&);
+        //- No copy construct
+        laplacianScheme(const laplacianScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const laplacianScheme&);
+        //- No copy assignment
+        void operator=(const laplacianScheme&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.H b/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.H
index ea2fe817e7..2273a8bdd8 100644
--- a/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.H
+++ b/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.H
@@ -61,10 +61,10 @@ class gaussLaplacianScheme
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         gaussLaplacianScheme(const gaussLaplacianScheme&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const gaussLaplacianScheme&) = delete;
 
 
diff --git a/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.H b/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.H
index f2419115cc..b7738b1d40 100644
--- a/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.H
+++ b/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.H
@@ -60,7 +60,7 @@ class correctedLnGrad
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const correctedLnGrad&) = delete;
 
 
diff --git a/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.H b/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.H
index 820aa87384..bafd6aa84a 100644
--- a/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.H
+++ b/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.H
@@ -60,7 +60,7 @@ class fourthLnGrad
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const fourthLnGrad&) = delete;
 
 
diff --git a/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.H b/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.H
index d5f275f721..0a6e73b1c0 100644
--- a/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.H
+++ b/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.H
@@ -76,8 +76,8 @@ class limitedLnGrad
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const limitedLnGrad&);
+        //- No copy assignment
+        void operator=(const limitedLnGrad&) = delete;
 
 
 public:
diff --git a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H
index 49fe89dd37..d4dc1d9348 100644
--- a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H
+++ b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H
@@ -72,7 +72,7 @@ class lnGradScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const lnGradScheme&) = delete;
 
 
diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H
index 5b7336eda6..22bcf97720 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H
+++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H
@@ -67,7 +67,7 @@ class edgeInterpolationScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const edgeInterpolationScheme&) = delete;
 
 
diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.H
index 27a33733f3..b8e7fd34a8 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.H
+++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.H
@@ -78,11 +78,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        faNVDscheme(const faNVDscheme&);
+        //- No copy construct
+        faNVDscheme(const faNVDscheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faNVDscheme&);
+        //- No copy assignment
+        void operator=(const faNVDscheme&) = delete;
 
 
 public:
diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/blended/blendedEdgeInterpolation.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/blended/blendedEdgeInterpolation.H
index 4750221875..c7ce4fd70b 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/schemes/blended/blendedEdgeInterpolation.H
+++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/blended/blendedEdgeInterpolation.H
@@ -63,11 +63,11 @@ class blendedEdgeInterpolation
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        blendedEdgeInterpolation(const blendedEdgeInterpolation&);
+        //- No copy construct
+        blendedEdgeInterpolation(const blendedEdgeInterpolation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const blendedEdgeInterpolation&);
+        //- No copy assignment
+        void operator=(const blendedEdgeInterpolation&) = delete;
 
 
 public:
diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/linear/linearEdgeInterpolation.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/linear/linearEdgeInterpolation.H
index 46a126d819..f760e4edca 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/schemes/linear/linearEdgeInterpolation.H
+++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/linear/linearEdgeInterpolation.H
@@ -56,8 +56,8 @@ class linearEdgeInterpolation
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const linearEdgeInterpolation&);
+        //- No copy assignment
+        void operator=(const linearEdgeInterpolation&) = delete;
 
 public:
 
diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/upwind/upwindEdgeInterpolation.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/upwind/upwindEdgeInterpolation.H
index c437f57654..cec45b6805 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/schemes/upwind/upwindEdgeInterpolation.H
+++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/upwind/upwindEdgeInterpolation.H
@@ -62,8 +62,8 @@ class upwindEdgeInterpolation
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const upwindEdgeInterpolation&);
+        //- No copy assignment
+        void operator=(const upwindEdgeInterpolation&) = delete;
 
 
 public:
diff --git a/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.H b/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.H
index e48955ff90..a4c78a7100 100644
--- a/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.H
+++ b/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.H
@@ -63,10 +63,10 @@ class volSurfaceMapping
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         volSurfaceMapping(const volSurfaceMapping&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const volSurfaceMapping&) = delete;
 
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/IOMRFZoneList.H b/src/finiteVolume/cfdTools/general/MRF/IOMRFZoneList.H
index 09b6591313..709768a2e9 100644
--- a/src/finiteVolume/cfdTools/general/MRF/IOMRFZoneList.H
+++ b/src/finiteVolume/cfdTools/general/MRF/IOMRFZoneList.H
@@ -76,11 +76,11 @@ private:
         //- Create IO object if dictionary is present
         IOobject createIOobject(const fvMesh& mesh) const;
 
-        //- Disallow default bitwise copy construct
-        IOMRFZoneList(const IOMRFZoneList&);
+        //- No copy construct
+        IOMRFZoneList(const IOMRFZoneList&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const IOMRFZoneList&);
+        //- No copy assignment
+        void operator=(const IOMRFZoneList&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index 1b86589daf..2296e803bb 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -146,11 +146,11 @@ class MRFZone
             surfaceScalarField& phi
         ) const;
 
-        //- Disallow default bitwise copy construct
-        MRFZone(const MRFZone&);
+        //- No copy construct
+        MRFZone(const MRFZone&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const MRFZone&);
+        //- No copy assignment
+        void operator=(const MRFZone&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
index fb36e689ea..f9f50e09c9 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
@@ -61,11 +61,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        MRFZoneList(const MRFZoneList&);
+        //- No copy construct
+        MRFZoneList(const MRFZoneList&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const MRFZoneList&);
+        //- No copy assignment
+        void operator=(const MRFZoneList&) = delete;
 
 
 protected:
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
index 763584dcd2..82d71d52e9 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
@@ -92,11 +92,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        SRFModel(const SRFModel&);
+        //- No copy construct
+        SRFModel(const SRFModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const SRFModel&);
+        //- No copy assignment
+        void operator=(const SRFModel&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H
index 1adaed982b..658c4d0bf4 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H
@@ -62,11 +62,11 @@ class rpm
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        rpm(const rpm&);
+        //- No copy construct
+        rpm(const rpm&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const rpm&);
+        //- No copy assignment
+        void operator=(const rpm&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/coupling/externalFileCoupler.H b/src/finiteVolume/cfdTools/general/coupling/externalFileCoupler.H
index 76375bca0b..ec961499fb 100644
--- a/src/finiteVolume/cfdTools/general/coupling/externalFileCoupler.H
+++ b/src/finiteVolume/cfdTools/general/coupling/externalFileCoupler.H
@@ -143,10 +143,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         externalFileCoupler(const externalFileCoupler&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const externalFileCoupler&) = delete;
 
 
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.H b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.H
index 78df2901e1..cd2654ec77 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.H
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.H
@@ -88,11 +88,11 @@ protected:
         //- Check that all sources have been applied
         void checkApplied() const;
 
-        //- Disallow default bitwise copy construct
-        optionList(const optionList&);
+        //- No copy construct
+        optionList(const optionList&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const optionList&);
+        //- No copy assignment
+        void operator=(const optionList&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H b/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H
index 1493b328b4..4dcdbb028f 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H
@@ -60,11 +60,11 @@ class options
         //- Create IO object if dictionary is present
         IOobject createIOobject(const fvMesh& mesh) const;
 
-        //- Disallow default bitwise copy construct
-        options(const options&);
+        //- No copy construct
+        options(const options&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const options&);
+        //- No copy assignment
+        void operator=(const options&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
index 363f739bde..96bcd160c6 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
@@ -118,11 +118,11 @@ class DarcyForchheimer
             const vectorField& U
         ) const;
 
-        //- Disallow default bitwise copy construct
-        DarcyForchheimer(const DarcyForchheimer&);
+        //- No copy construct
+        DarcyForchheimer(const DarcyForchheimer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const DarcyForchheimer&);
+        //- No copy assignment
+        void operator=(const DarcyForchheimer&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
index e9ca67327f..af67f523d4 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
@@ -95,11 +95,11 @@ class fixedCoeff
             const scalar rho
         ) const;
 
-        //- Disallow default bitwise copy construct
-        fixedCoeff(const fixedCoeff&);
+        //- No copy construct
+        fixedCoeff(const fixedCoeff&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fixedCoeff&);
+        //- No copy assignment
+        void operator=(const fixedCoeff&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.H b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.H
index e9e534926a..62502570d1 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.H
@@ -59,11 +59,11 @@ private:
         //- Create IO object if dictionary is present
         IOobject createIOobject(const fvMesh& mesh) const;
 
-        //- Disallow default bitwise copy construct
-        IOporosityModelList(const IOporosityModelList&);
+        //- No copy construct
+        IOporosityModelList(const IOporosityModelList&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const IOporosityModelList&);
+        //- No copy assignment
+        void operator=(const IOporosityModelList&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
index bc7c496dd6..d7da01a82d 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
@@ -59,11 +59,11 @@ class porosityModel
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        porosityModel(const porosityModel&);
+        //- No copy construct
+        porosityModel(const porosityModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const porosityModel&);
+        //- No copy assignment
+        void operator=(const porosityModel&) = delete;
 
 
 protected:
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.H b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.H
index 3e953c30ef..fb48794662 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.H
@@ -61,11 +61,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        porosityModelList(const porosityModelList&);
+        //- No copy construct
+        porosityModelList(const porosityModelList&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const porosityModelList&);
+        //- No copy assignment
+        void operator=(const porosityModelList&) = delete;
 
 
 protected:
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
index 33db437908..3d97f2786f 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
@@ -96,11 +96,11 @@ class powerLaw
             const vectorField& U
         ) const;
 
-        //- Disallow default bitwise copy construct
-        powerLaw(const powerLaw&);
+        //- No copy construct
+        powerLaw(const powerLaw&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const powerLaw&);
+        //- No copy assignment
+        void operator=(const powerLaw&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
index 119ba56805..3922d54775 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
@@ -159,11 +159,11 @@ class solidification
             const volVectorField& U
         ) const;
 
-        //- Disallow default bitwise copy construct
-        solidification(const solidification&);
+        //- No copy construct
+        solidification(const solidification&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const solidification&);
+        //- No copy assignment
+        void operator=(const solidification&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
index 73134cdaab..1604ef38c3 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
@@ -56,10 +56,10 @@ class pimpleControl
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         pimpleControl(const pimpleControl&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const pimpleControl&) = delete;
 
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
index eede038374..2f152cff01 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
@@ -53,11 +53,11 @@ class pisoControl
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        pisoControl(const pisoControl&);
+        //- No copy construct
+        pisoControl(const pisoControl&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pisoControl&);
+        //- No copy assignment
+        void operator=(const pisoControl&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
index 36849c7597..cb76794bf4 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
@@ -73,10 +73,10 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         simpleControl(const simpleControl&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const simpleControl&) = delete;
 
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
index 921fbcd258..966a754ae0 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
@@ -165,10 +165,10 @@ protected:
 
 private:
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         solutionControl(const solutionControl&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const solutionControl&) = delete;
 
 
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
index 0573ef4fc2..eecf8469db 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
@@ -73,11 +73,11 @@ class boundedConvectionScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        boundedConvectionScheme(const boundedConvectionScheme&);
+        //- No copy construct
+        boundedConvectionScheme(const boundedConvectionScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const boundedConvectionScheme&);
+        //- No copy assignment
+        void operator=(const boundedConvectionScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
index 20f2034181..6188fdd4e8 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
@@ -66,11 +66,11 @@ class gaussConvectionScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        gaussConvectionScheme(const gaussConvectionScheme&);
+        //- No copy construct
+        gaussConvectionScheme(const gaussConvectionScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const gaussConvectionScheme&);
+        //- No copy assignment
+        void operator=(const gaussConvectionScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
index 0ce4c7d220..cb343f9d9e 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
@@ -59,11 +59,11 @@ class EulerD2dt2Scheme
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        EulerD2dt2Scheme(const EulerD2dt2Scheme&);
+        //- No copy construct
+        EulerD2dt2Scheme(const EulerD2dt2Scheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const EulerD2dt2Scheme&);
+        //- No copy assignment
+        void operator=(const EulerD2dt2Scheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
index 76fe1160b3..8f56584203 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
@@ -58,11 +58,11 @@ class steadyStateD2dt2Scheme
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        steadyStateD2dt2Scheme(const steadyStateD2dt2Scheme&);
+        //- No copy construct
+        steadyStateD2dt2Scheme(const steadyStateD2dt2Scheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const steadyStateD2dt2Scheme&);
+        //- No copy assignment
+        void operator=(const steadyStateD2dt2Scheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
index 403ccb3d0f..c8f904e4b3 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
@@ -81,11 +81,11 @@ class CoEulerDdtScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        CoEulerDdtScheme(const CoEulerDdtScheme&);
+        //- No copy construct
+        CoEulerDdtScheme(const CoEulerDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const CoEulerDdtScheme&);
+        //- No copy assignment
+        void operator=(const CoEulerDdtScheme&) = delete;
 
         //- Return the reciprocal of the Courant-number limited time-step
         tmp<volScalarField> CorDeltaT() const;
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
index e7538c451d..97516f3ece 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
@@ -163,10 +163,10 @@ class CrankNicolsonDdtScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         CrankNicolsonDdtScheme(const CrankNicolsonDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const CrankNicolsonDdtScheme&) = delete;
 
         template<class GeoField>
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
index e83543364b..1a64a07722 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
@@ -62,11 +62,11 @@ class EulerDdtScheme
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        EulerDdtScheme(const EulerDdtScheme&);
+        //- No copy construct
+        EulerDdtScheme(const EulerDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const EulerDdtScheme&);
+        //- No copy assignment
+        void operator=(const EulerDdtScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
index f31b6d3d55..06f94c3fbb 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
@@ -83,11 +83,11 @@ class SLTSDdtScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        SLTSDdtScheme(const SLTSDdtScheme&);
+        //- No copy construct
+        SLTSDdtScheme(const SLTSDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const SLTSDdtScheme&);
+        //- No copy assignment
+        void operator=(const SLTSDdtScheme&) = delete;
 
         //- Calculate a relaxed diagonal from the given flux field
         void relaxedDiag(scalarField& rD, const surfaceScalarField& phi) const;
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
index 0d7e9174d9..04b304cd06 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
@@ -73,11 +73,11 @@ class backwardDdtScheme
         template<class GeoField>
         scalar deltaT0_(const GeoField&) const;
 
-        //- Disallow default bitwise copy construct
-        backwardDdtScheme(const backwardDdtScheme&);
+        //- No copy construct
+        backwardDdtScheme(const backwardDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const backwardDdtScheme&);
+        //- No copy assignment
+        void operator=(const backwardDdtScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
index f6b51cbbff..83539db19e 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
@@ -73,11 +73,11 @@ class boundedDdtScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        boundedDdtScheme(const boundedDdtScheme&);
+        //- No copy construct
+        boundedDdtScheme(const boundedDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const boundedDdtScheme&);
+        //- No copy assignment
+        void operator=(const boundedDdtScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
index 1d6841aaa1..7b15d2253a 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
@@ -120,11 +120,11 @@ class localEulerDdtScheme
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        localEulerDdtScheme(const localEulerDdtScheme&);
+        //- No copy construct
+        localEulerDdtScheme(const localEulerDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const localEulerDdtScheme&);
+        //- No copy assignment
+        void operator=(const localEulerDdtScheme&) = delete;
 
         //- Return the reciprocal of the local time-step
         const volScalarField& localRDeltaT() const;
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
index a3300fe801..777092b1cd 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
@@ -61,11 +61,11 @@ class steadyStateDdtScheme
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        steadyStateDdtScheme(const steadyStateDdtScheme&);
+        //- No copy construct
+        steadyStateDdtScheme(const steadyStateDdtScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const steadyStateDdtScheme&);
+        //- No copy assignment
+        void operator=(const steadyStateDdtScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H
index 86ff5f95a1..7cd178d9cf 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H
@@ -61,11 +61,11 @@ class gaussDivScheme
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        gaussDivScheme(const gaussDivScheme&);
+        //- No copy construct
+        gaussDivScheme(const gaussDivScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const gaussDivScheme&);
+        //- No copy assignment
+        void operator=(const gaussDivScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
index 839ae4e724..4768eb772f 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
@@ -91,11 +91,11 @@ class fvSchemes
         //- Read settings from the dictionary
         void read(const dictionary&);
 
-        //- Disallow default bitwise copy construct
-        fvSchemes(const fvSchemes&);
+        //- No copy construct
+        fvSchemes(const fvSchemes&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvSchemes&);
+        //- No copy assignment
+        void operator=(const fvSchemes&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/fvSolution/fvSolution.H b/src/finiteVolume/finiteVolume/fvSolution/fvSolution.H
index 9eb17f405c..3e43380820 100644
--- a/src/finiteVolume/finiteVolume/fvSolution/fvSolution.H
+++ b/src/finiteVolume/finiteVolume/fvSolution/fvSolution.H
@@ -51,9 +51,11 @@ class fvSolution
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        fvSolution(const fvSolution&);
-        void operator=(const fvSolution&);
+        //- No copy construct
+        fvSolution(const fvSolution&) = delete;
+
+        //- No copy assignment
+        void operator=(const fvSolution&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
index fd2cd40d20..da65363ae5 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
@@ -94,11 +94,11 @@ class LeastSquaresGrad
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        LeastSquaresGrad(const LeastSquaresGrad&);
+        //- No copy construct
+        LeastSquaresGrad(const LeastSquaresGrad&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const LeastSquaresGrad&);
+        //- No copy assignment
+        void operator=(const LeastSquaresGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H
index 203515bafa..46cc21823b 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.H
@@ -61,11 +61,11 @@ class fourthGrad
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fourthGrad(const fourthGrad&);
+        //- No copy construct
+        fourthGrad(const fourthGrad&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fourthGrad&);
+        //- No copy assignment
+        void operator=(const fourthGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
index 925392952e..5f92df6887 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H
@@ -69,11 +69,11 @@ class gaussGrad
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        gaussGrad(const gaussGrad&);
+        //- No copy construct
+        gaussGrad(const gaussGrad&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const gaussGrad&);
+        //- No copy assignment
+        void operator=(const gaussGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H
index 103a5de4c8..85e762502f 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.H
@@ -61,11 +61,11 @@ class leastSquaresGrad
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        leastSquaresGrad(const leastSquaresGrad&);
+        //- No copy construct
+        leastSquaresGrad(const leastSquaresGrad&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const leastSquaresGrad&);
+        //- No copy assignment
+        void operator=(const leastSquaresGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
index 8b31b5d97b..3bc7d42c10 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
@@ -74,11 +74,11 @@ class cellLimitedGrad
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellLimitedGrad(const cellLimitedGrad&);
+        //- No copy construct
+        cellLimitedGrad(const cellLimitedGrad&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellLimitedGrad&);
+        //- No copy assignment
+        void operator=(const cellLimitedGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
index f208a8c5da..e469ed3246 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
@@ -74,11 +74,11 @@ class cellMDLimitedGrad
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellMDLimitedGrad(const cellMDLimitedGrad&);
+        //- No copy construct
+        cellMDLimitedGrad(const cellMDLimitedGrad&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellMDLimitedGrad&);
+        //- No copy assignment
+        void operator=(const cellMDLimitedGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
index 99730edc8f..25daa2bd0f 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
@@ -83,11 +83,11 @@ class faceLimitedGrad
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        faceLimitedGrad(const faceLimitedGrad&);
+        //- No copy construct
+        faceLimitedGrad(const faceLimitedGrad&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faceLimitedGrad&);
+        //- No copy assignment
+        void operator=(const faceLimitedGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
index 981bcdf84a..7ab32b22fb 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
@@ -83,11 +83,11 @@ class faceMDLimitedGrad
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        faceMDLimitedGrad(const faceMDLimitedGrad&);
+        //- No copy construct
+        faceMDLimitedGrad(const faceMDLimitedGrad&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faceMDLimitedGrad&);
+        //- No copy assignment
+        void operator=(const faceMDLimitedGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
index 1197edb8c3..61cc3eaac2 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
@@ -67,11 +67,11 @@ class gaussLaplacianScheme
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-        //- Disallow default bitwise copy construct
-        gaussLaplacianScheme(const gaussLaplacianScheme&);
+        //- No copy construct
+        gaussLaplacianScheme(const gaussLaplacianScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const gaussLaplacianScheme&);
+        //- No copy assignment
+        void operator=(const gaussLaplacianScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
index 282637232c..da3d1ee4ba 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
@@ -71,11 +71,11 @@ class CentredFitSnGradScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        CentredFitSnGradScheme(const CentredFitSnGradScheme&);
+        //- No copy construct
+        CentredFitSnGradScheme(const CentredFitSnGradScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const CentredFitSnGradScheme&);
+        //- No copy assignment
+        void operator=(const CentredFitSnGradScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
index 6f0f4af757..bddb7d81f4 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
@@ -61,8 +61,8 @@ class correctedSnGrad
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const correctedSnGrad&);
+        //- No copy assignment
+        void operator=(const correctedSnGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
index 3fdc7e9dbc..3d5ef599a2 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H
@@ -61,8 +61,8 @@ class faceCorrectedSnGrad
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const faceCorrectedSnGrad&);
+        //- No copy assignment
+        void operator=(const faceCorrectedSnGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
index eeeebef1aa..eb4e5fc94f 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
@@ -81,8 +81,8 @@ class limitedSnGrad
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const limitedSnGrad&);
+        //- No copy assignment
+        void operator=(const limitedSnGrad&) = delete;
 
         //- Lookup function for the corrected to support backward compatibility
         //  of dictionary specification
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
index 80ca7f4f17..5643912454 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
@@ -62,8 +62,8 @@ class orthogonalSnGrad
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const orthogonalSnGrad&);
+        //- No copy assignment
+        void operator=(const orthogonalSnGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
index ea903ad968..fd32983b81 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
@@ -62,8 +62,8 @@ class uncorrectedSnGrad
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const uncorrectedSnGrad&);
+        //- No copy assignment
+        void operator=(const uncorrectedSnGrad&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/functionObjects/fieldSelection/fieldSelection.H b/src/finiteVolume/functionObjects/fieldSelection/fieldSelection.H
index 1ff154ec3b..72af300dbc 100644
--- a/src/finiteVolume/functionObjects/fieldSelection/fieldSelection.H
+++ b/src/finiteVolume/functionObjects/fieldSelection/fieldSelection.H
@@ -61,7 +61,7 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         fieldSelection(const fieldSelection&) = delete;
 
 
diff --git a/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.H b/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.H
index 8a3f1160a1..cb94ce10b8 100644
--- a/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.H
+++ b/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.H
@@ -59,7 +59,7 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         fileFieldSelection(const fileFieldSelection&) = delete;
 
 
diff --git a/src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.H b/src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.H
index 55d860a199..7473c9e536 100644
--- a/src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.H
+++ b/src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.H
@@ -56,7 +56,7 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         solverFieldSelection(const solverFieldSelection&) = delete;
 
 
diff --git a/src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.H b/src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.H
index cad0440bd7..4dca6608e3 100644
--- a/src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.H
+++ b/src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.H
@@ -56,7 +56,7 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         volFieldSelection(const volFieldSelection&) = delete;
 
 
diff --git a/src/finiteVolume/functionObjects/fvMeshFunctionObject/fvMeshFunctionObject.H b/src/finiteVolume/functionObjects/fvMeshFunctionObject/fvMeshFunctionObject.H
index 7dff1ae3cf..92c16daab2 100644
--- a/src/finiteVolume/functionObjects/fvMeshFunctionObject/fvMeshFunctionObject.H
+++ b/src/finiteVolume/functionObjects/fvMeshFunctionObject/fvMeshFunctionObject.H
@@ -77,10 +77,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         fvMeshFunctionObject(const fvMeshFunctionObject&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const fvMeshFunctionObject&) = delete;
 
 
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H
index e0c6a3e9ae..3e9db7f573 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H
@@ -182,11 +182,11 @@ class isoAdvection
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        isoAdvection(const isoAdvection&);
+        //- No copy construct
+        isoAdvection(const isoAdvection&) = delete;
 
-        //- Disallow default bitwise copy assignment
-        void operator=(const isoAdvection&);
+        //- No copy assignment
+        void operator=(const isoAdvection&) = delete;
 
 
         // Advection functions
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
index 6197c86f35..0759b25ae4 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
@@ -63,14 +63,14 @@ class extendedCentredCellToCellStencil
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         extendedCentredCellToCellStencil
         (
             const extendedCentredCellToCellStencil&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const extendedCentredCellToCellStencil&);
+        //- No copy assignment
+        void operator=(const extendedCentredCellToCellStencil&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
index 01053a0cb7..b03feec1a1 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
@@ -62,14 +62,14 @@ class extendedCentredCellToFaceStencil
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         extendedCentredCellToFaceStencil
         (
             const extendedCentredCellToFaceStencil&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const extendedCentredCellToFaceStencil&);
+        //- No copy assignment
+        void operator=(const extendedCentredCellToFaceStencil&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
index 3f082e8761..fd4f6bfdc3 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
@@ -113,11 +113,14 @@ class extendedUpwindCellToFaceStencil
         );
 
 
-        //- Disallow default bitwise copy construct
-        extendedUpwindCellToFaceStencil(const extendedUpwindCellToFaceStencil&);
+        //- No copy construct
+        extendedUpwindCellToFaceStencil
+        (
+            const extendedUpwindCellToFaceStencil&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const extendedUpwindCellToFaceStencil&);
+        //- No copy assignment
+        void operator=(const extendedUpwindCellToFaceStencil&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
index 12eca38a4d..e8b87281dc 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
@@ -62,14 +62,14 @@ class extendedCentredFaceToCellStencil
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         extendedCentredFaceToCellStencil
         (
             const extendedCentredFaceToCellStencil&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const extendedCentredFaceToCellStencil&);
+        //- No copy assignment
+        void operator=(const extendedCentredFaceToCellStencil&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
index cf9ee4c35f..2fe892bd64 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H
@@ -62,11 +62,11 @@ class fvBoundaryMesh
 
     // Private Member Functions
 
-        //- Disallow default copy construct
-        fvBoundaryMesh(const fvBoundaryMesh&);
+        //- No copy construct
+        fvBoundaryMesh(const fvBoundaryMesh&) = delete;
 
-        //- Disallow assignment
-        void operator=(const fvBoundaryMesh&);
+        //- No copy assignment
+        void operator=(const fvBoundaryMesh&) = delete;
 
         //- Add fvPatches corresponding to the given polyBoundaryMesh
         void addPatches(const polyBoundaryMesh&);
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 16b4e11b81..a2bd7e403c 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -159,10 +159,10 @@ class fvMesh
             void makeCf() const;
 
 
-        //- Disallow construct as copy
+        //- No copy construct
         fvMesh(const fvMesh&) = delete;
 
-        //- Disallow assignment
+        //- No copy assignment
         void operator=(const fvMesh&) = delete;
 
 
diff --git a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
index 7b3267ba24..a8dd315aab 100644
--- a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
+++ b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
@@ -68,11 +68,11 @@ class fvMeshLduAddressing
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fvMeshLduAddressing(const fvMeshLduAddressing&);
+        //- No copy construct
+        fvMeshLduAddressing(const fvMeshLduAddressing&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvMeshLduAddressing&);
+        //- No copy assignment
+        void operator=(const fvMeshLduAddressing&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
index 7e2dacdbdb..55868e324e 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
@@ -50,11 +50,11 @@ class fvBoundaryMeshMapper
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fvBoundaryMeshMapper(const fvBoundaryMeshMapper&);
+        //- No copy construct
+        fvBoundaryMeshMapper(const fvBoundaryMeshMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvBoundaryMeshMapper&);
+        //- No copy assignment
+        void operator=(const fvBoundaryMeshMapper&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
index 41d049bbb6..74654dd44e 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
@@ -75,11 +75,11 @@ class fvMeshMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fvMeshMapper(const fvMeshMapper&);
+        //- No copy construct
+        fvMeshMapper(const fvMeshMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvMeshMapper&);
+        //- No copy assignment
+        void operator=(const fvMeshMapper&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
index 25fa68e811..23c15186f4 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
@@ -85,14 +85,11 @@ class fvPatchMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fvPatchMapper
-        (
-            const fvPatchMapper&
-        );
+        //- No copy construct
+        fvPatchMapper(const fvPatchMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvPatchMapper&);
+        //- No copy assignment
+        void operator=(const fvPatchMapper&) = delete;
 
 
         //- Calculate addressing for mapping with inserted cells
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
index 6a333c0a71..c6b6346fef 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
@@ -83,11 +83,11 @@ class fvSurfaceMapper
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fvSurfaceMapper(const fvSurfaceMapper&);
+        //- No copy construct
+        fvSurfaceMapper(const fvSurfaceMapper&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvSurfaceMapper&);
+        //- No copy assignment
+        void operator=(const fvSurfaceMapper&) = delete;
 
 
         //- Calculate addressing
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
index 33a7e64941..9ff33bad11 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
@@ -72,11 +72,11 @@ class fvPatch
 
     // Private Member Functions
 
-        //- Disallow construct as copy
-        fvPatch(const fvPatch&);
+        //- No copy construct
+        fvPatch(const fvPatch&) = delete;
 
-        //- Disallow assignment
-        void operator=(const fvPatch&);
+        //- No copy assignment
+        void operator=(const fvPatch&) = delete;
 
 
 protected:
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
index f439b425a4..e42c51168e 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
@@ -78,11 +78,11 @@ class singleCellFvMesh
         void agglomerateMesh(const fvMesh&, const labelListList&);
 
 
-        //- Disallow default bitwise copy construct
-        singleCellFvMesh(const singleCellFvMesh&);
+        //- No copy construct
+        singleCellFvMesh(const singleCellFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const singleCellFvMesh&);
+        //- No copy assignment
+        void operator=(const singleCellFvMesh&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H
index f67a20aae6..8b2da1d979 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H
@@ -64,11 +64,11 @@ class nearWallDist
         //- Do all calculations
         void calculate();
 
-        //- Disallow default bitwise copy construct
-        nearWallDist(const nearWallDist&);
+        //- No copy construct
+        nearWallDist(const nearWallDist&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const nearWallDist&);
+        //- No copy assignment
+        void operator=(const nearWallDist&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.H b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.H
index e9933660eb..f235ceb9ab 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.H
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.H
@@ -65,11 +65,11 @@ class nearWallDistNoSearch
         //- Do all calculations.
         void doAll();
 
-        //- Disallow default bitwise copy construct
-        nearWallDistNoSearch(const nearWallDistNoSearch&);
+        //- No copy construct
+        nearWallDistNoSearch(const nearWallDistNoSearch&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const nearWallDistNoSearch&);
+        //- No copy assignment
+        void operator=(const nearWallDistNoSearch&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.H b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.H
index b2be9da2b6..bdfa34669c 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.H
@@ -127,11 +127,11 @@ class Poisson
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        Poisson(const Poisson&);
+        //- No copy construct
+        Poisson(const Poisson&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const Poisson&);
+        //- No copy assignment
+        void operator=(const Poisson&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.H b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.H
index cd2113d673..1cabb77a9d 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.H
@@ -207,11 +207,11 @@ class advectionDiffusion
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        advectionDiffusion(const advectionDiffusion&);
+        //- No copy construct
+        advectionDiffusion(const advectionDiffusion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const advectionDiffusion&);
+        //- No copy assignment
+        void operator=(const advectionDiffusion&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.H b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.H
index 0ed9aef4f7..8e4512b2f0 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.H
@@ -86,11 +86,11 @@ class meshWave
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        meshWave(const meshWave&);
+        //- No copy construct
+        meshWave(const meshWave&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const meshWave&);
+        //- No copy assignment
+        void operator=(const meshWave&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.H b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.H
index 3c1052fab7..43eabdea77 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.H
@@ -81,11 +81,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        wallDistData(const wallDistData&);
+        //- No copy construct
+        wallDistData(const wallDistData&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const wallDistData&);
+        //- No copy assignment
+        void operator=(const wallDistData&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
index 573a1a4539..555c88cad1 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
@@ -71,11 +71,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        patchDistMethod(const patchDistMethod&);
+        //- No copy construct
+        patchDistMethod(const patchDistMethod&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const patchDistMethod&);
+        //- No copy assignment
+        void operator=(const patchDistMethod&) = delete;
 
 public:
 
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
index 11a17c3d33..e3300aca74 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
@@ -109,11 +109,11 @@ class wallDist
         //- Construct the normal-to-wall field as required
         void constructn() const;
 
-        //- Disallow default bitwise copy construct
-        wallDist(const wallDist&);
+        //- No copy construct
+        wallDist(const wallDist&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const wallDist&);
+        //- No copy assignment
+        void operator=(const wallDist&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
index d9d8e1a6fd..5d600ddc82 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
@@ -78,11 +78,11 @@ class LimitedScheme
             surfaceScalarField& limiterField
         ) const;
 
-        //- Disallow default bitwise copy construct
-        LimitedScheme(const LimitedScheme&);
+        //- No copy construct
+        LimitedScheme(const LimitedScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const LimitedScheme&);
+        //- No copy assignment
+        void operator=(const LimitedScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
index ca7fb074b9..32c14cda68 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.H
@@ -67,11 +67,11 @@ class PhiScheme
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PhiScheme(const PhiScheme&);
+        //- No copy construct
+        PhiScheme(const PhiScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PhiScheme&);
+        //- No copy assignment
+        void operator=(const PhiScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
index f74b56df9d..5dfbc49bf6 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
@@ -63,11 +63,11 @@ class blended
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        blended(const blended&);
+        //- No copy construct
+        blended(const blended&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const blended&);
+        //- No copy assignment
+        void operator=(const blended&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H
index 0fdbd57567..42f722a0a1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitWith/limitWith.H
@@ -65,11 +65,11 @@ class limitWith
         tmp<limitedSurfaceInterpolationScheme<Type>> tLimiter_;
 
 
-        //- Disallow default bitwise copy construct
-        limitWith(const limitWith&);
+        //- No copy construct
+        limitWith(const limitWith&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const limitWith&);
+        //- No copy assignment
+        void operator=(const limitWith&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
index 816de8ab7b..460f4af5e8 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
@@ -56,14 +56,14 @@ class limitedSurfaceInterpolationScheme
 {
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         limitedSurfaceInterpolationScheme
         (
             const limitedSurfaceInterpolationScheme&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const limitedSurfaceInterpolationScheme&);
+        //- No copy assignment
+        void operator=(const limitedSurfaceInterpolationScheme&) = delete;
 
 
 protected:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
index 8d8b07f76f..81c463a4d6 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
@@ -58,8 +58,8 @@ class upwind
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const upwind&);
+        //- No copy assignment
+        void operator=(const upwind&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
index d255170cfe..ead28d79f4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateIndependentScheme/multivariateIndependentScheme.H
@@ -66,11 +66,14 @@ class multivariateIndependentScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        multivariateIndependentScheme(const multivariateIndependentScheme&);
+        //- No copy construct
+        multivariateIndependentScheme
+        (
+            const multivariateIndependentScheme&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const multivariateIndependentScheme&);
+        //- No copy assignment
+        void operator=(const multivariateIndependentScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
index 0cce900c4c..08818bcbb0 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H
@@ -62,11 +62,11 @@ class multivariateScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        multivariateScheme(const multivariateScheme&);
+        //- No copy construct
+        multivariateScheme(const multivariateScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const multivariateScheme&);
+        //- No copy assignment
+        void operator=(const multivariateScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
index fec04468e4..9dd723c6de 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.H
@@ -62,11 +62,14 @@ class multivariateSelectionScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        multivariateSelectionScheme(const multivariateSelectionScheme&);
+        //- No copy construct
+        multivariateSelectionScheme
+        (
+            const multivariateSelectionScheme&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const multivariateSelectionScheme&);
+        //- No copy assignment
+        void operator=(const multivariateSelectionScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H
index 848f1bae52..97e138f5fb 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/upwind/multivariateUpwind.H
@@ -59,11 +59,11 @@ class multivariateUpwind
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        multivariateUpwind(const multivariateUpwind&);
+        //- No copy construct
+        multivariateUpwind(const multivariateUpwind&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const multivariateUpwind&);
+        //- No copy assignment
+        void operator=(const multivariateUpwind&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
index 48f3675b40..b1e96e5960 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
@@ -66,11 +66,11 @@ class CentredFitScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        CentredFitScheme(const CentredFitScheme&);
+        //- No copy construct
+        CentredFitScheme(const CentredFitScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const CentredFitScheme&);
+        //- No copy assignment
+        void operator=(const CentredFitScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
index f311c7b60f..8d2de37c9d 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
@@ -105,11 +105,11 @@ class CoBlended
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        CoBlended(const CoBlended&);
+        //- No copy construct
+        CoBlended(const CoBlended&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const CoBlended&);
+        //- No copy assignment
+        void operator=(const CoBlended&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H
index 00802267c3..5750784d21 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/LUST/LUST.H
@@ -62,11 +62,11 @@ class LUST
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        LUST(const LUST&);
+        //- No copy construct
+        LUST(const LUST&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const LUST&);
+        //- No copy assignment
+        void operator=(const LUST&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
index ede33e2217..ce6975c3b4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/PureUpwindFitScheme/PureUpwindFitScheme.H
@@ -67,11 +67,11 @@ class PureUpwindFitScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        PureUpwindFitScheme(const PureUpwindFitScheme&);
+        //- No copy construct
+        PureUpwindFitScheme(const PureUpwindFitScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PureUpwindFitScheme&);
+        //- No copy assignment
+        void operator=(const PureUpwindFitScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
index 5e2b771ba2..72eb61e6aa 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
@@ -69,11 +69,11 @@ class UpwindFitScheme
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        UpwindFitScheme(const UpwindFitScheme&);
+        //- No copy construct
+        UpwindFitScheme(const UpwindFitScheme&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const UpwindFitScheme&);
+        //- No copy assignment
+        void operator=(const UpwindFitScheme&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
index c8982913b1..02bf60416a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@@ -114,11 +114,11 @@ class cellCoBlended
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellCoBlended(const cellCoBlended&);
+        //- No copy construct
+        cellCoBlended(const cellCoBlended&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellCoBlended&);
+        //- No copy assignment
+        void operator=(const cellCoBlended&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
index 5e71b0b184..718095badd 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
@@ -78,8 +78,8 @@ class clippedLinear
         }
 
 
-        //- Disallow default bitwise assignment
-        void operator=(const clippedLinear&);
+        //- No copy assignment
+        void operator=(const clippedLinear&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
index e9c5a201be..8eb1367e0f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
@@ -58,11 +58,11 @@ class cubic
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cubic(const cubic&);
+        //- No copy construct
+        cubic(const cubic&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cubic&);
+        //- No copy assignment
+        void operator=(const cubic&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/deferredCorrection/deferredCorrection.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/deferredCorrection/deferredCorrection.H
index af69763d86..bd21885141 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/deferredCorrection/deferredCorrection.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/deferredCorrection/deferredCorrection.H
@@ -80,10 +80,10 @@ class deferredCorrection
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         deferredCorrection(const deferredCorrection&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const deferredCorrection&) = delete;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/downwind/downwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/downwind/downwind.H
index 6b47c13750..583b494dde 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/downwind/downwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/downwind/downwind.H
@@ -63,8 +63,8 @@ class downwind
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const downwind&);
+        //- No copy assignment
+        void operator=(const downwind&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
index 97582173f3..5e976f7fb4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
@@ -75,11 +75,11 @@ class fixedBlended
         tmp<surfaceInterpolationScheme<Type>> tScheme2_;
 
 
-        //- Disallow default bitwise copy construct
-        fixedBlended(const fixedBlended&);
+        //- No copy construct
+        fixedBlended(const fixedBlended&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fixedBlended&);
+        //- No copy assignment
+        void operator=(const fixedBlended&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
index 70e75e6b02..83fe7f36cb 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
@@ -61,8 +61,8 @@ class harmonic
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const harmonic&);
+        //- No copy assignment
+        void operator=(const harmonic&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
index 3c1da4dea0..26a3ffe536 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
@@ -72,11 +72,11 @@ class limiterBlended
         tmp<surfaceInterpolationScheme<Type>> tScheme2_;
 
 
-        //- Disallow default bitwise copy construct
-        limiterBlended(const limiterBlended&);
+        //- No copy construct
+        limiterBlended(const limiterBlended&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const limiterBlended&);
+        //- No copy assignment
+        void operator=(const limiterBlended&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
index 9ad5de4f5a..486bbead34 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
@@ -57,8 +57,8 @@ class linear
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const linear&);
+        //- No copy assignment
+        void operator=(const linear&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
index 9d73a61b03..6998208a63 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H
@@ -64,11 +64,11 @@ class linearUpwind
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        linearUpwind(const linearUpwind&);
+        //- No copy construct
+        linearUpwind(const linearUpwind&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const linearUpwind&);
+        //- No copy assignment
+        void operator=(const linearUpwind&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
index 99277ccb6d..63d4ca0a79 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H
@@ -61,11 +61,11 @@ class linearUpwindV
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        linearUpwindV(const linearUpwindV&);
+        //- No copy construct
+        linearUpwindV(const linearUpwindV&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const linearUpwindV&);
+        //- No copy assignment
+        void operator=(const linearUpwindV&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
index b185728b2e..8478a92939 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
@@ -65,11 +65,11 @@ class localBlended
         tmp<surfaceInterpolationScheme<Type>> tScheme2_;
 
 
-        //- Disallow default bitwise copy construct
-        localBlended(const localBlended&);
+        //- No copy construct
+        localBlended(const localBlended&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const localBlended&);
+        //- No copy assignment
+        void operator=(const localBlended&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
index 075bc29c73..84f4bb2586 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
@@ -61,8 +61,8 @@ class localMax
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const localMax&);
+        //- No copy assignment
+        void operator=(const localMax&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
index e077a5f0c6..b46d829e47 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
@@ -61,8 +61,8 @@ class localMin
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const localMin&);
+        //- No copy assignment
+        void operator=(const localMin&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
index d326787bc4..467f1306d9 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
@@ -57,8 +57,8 @@ class midPoint
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const midPoint&);
+        //- No copy assignment
+        void operator=(const midPoint&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
index 93cd27b9aa..e7e37e28aa 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
@@ -73,11 +73,11 @@ class outletStabilised
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        outletStabilised(const outletStabilised&);
+        //- No copy construct
+        outletStabilised(const outletStabilised&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const outletStabilised&);
+        //- No copy assignment
+        void operator=(const outletStabilised&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
index 56cc893dd8..c83885be41 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.H
@@ -59,11 +59,11 @@ class pointLinear
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointLinear(const pointLinear&);
+        //- No copy construct
+        pointLinear(const pointLinear&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointLinear&);
+        //- No copy assignment
+        void operator=(const pointLinear&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
index f157e0d0d4..17527c6452 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
@@ -59,8 +59,8 @@ class reverseLinear
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const reverseLinear&);
+        //- No copy assignment
+        void operator=(const reverseLinear&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
index 5503048f59..69b64870e3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
@@ -65,11 +65,11 @@ class skewCorrected
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        skewCorrected(const skewCorrected&);
+        //- No copy construct
+        skewCorrected(const skewCorrected&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const skewCorrected&);
+        //- No copy assignment
+        void operator=(const skewCorrected&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weighted/weighted.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weighted/weighted.H
index f390d81751..7900901958 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weighted/weighted.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weighted/weighted.H
@@ -62,8 +62,8 @@ class weighted
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const weighted&);
+        //- No copy assignment
+        void operator=(const weighted&) = delete;
 
 
 public:
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H
index f34ae6f304..c98a7af6d9 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.H
@@ -81,11 +81,11 @@ class pointConstraints
         //- Make patch-patch constraints
         void makePatchPatchAddressing();
 
-        //- Disallow default bitwise copy construct
-        pointConstraints(const pointConstraints&);
+        //- No copy construct
+        pointConstraints(const pointConstraints&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointConstraints&);
+        //- No copy assignment
+        void operator=(const pointConstraints&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/Curle/Curle.H b/src/functionObjects/field/Curle/Curle.H
index e79525b21a..a236a3d1ac 100644
--- a/src/functionObjects/field/Curle/Curle.H
+++ b/src/functionObjects/field/Curle/Curle.H
@@ -120,10 +120,10 @@ class Curle
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         Curle(const Curle&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const Curle&) = delete;
 
 
diff --git a/src/functionObjects/field/DESModelRegions/DESModelRegions.H b/src/functionObjects/field/DESModelRegions/DESModelRegions.H
index c10f9f0e51..8119b9d738 100644
--- a/src/functionObjects/field/DESModelRegions/DESModelRegions.H
+++ b/src/functionObjects/field/DESModelRegions/DESModelRegions.H
@@ -97,10 +97,10 @@ protected:
         //- File header information
         virtual void writeFileHeader(Ostream& os) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         DESModelRegions(const DESModelRegions&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const DESModelRegions&) = delete;
 
 
diff --git a/src/functionObjects/field/XiReactionRate/XiReactionRate.H b/src/functionObjects/field/XiReactionRate/XiReactionRate.H
index 7e2fb564c6..a8c93c8b3b 100644
--- a/src/functionObjects/field/XiReactionRate/XiReactionRate.H
+++ b/src/functionObjects/field/XiReactionRate/XiReactionRate.H
@@ -78,11 +78,11 @@ class XiReactionRate
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        XiReactionRate(const XiReactionRate&);
+        //- No copy construct
+        XiReactionRate(const XiReactionRate&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const XiReactionRate&);
+        //- No copy assignment
+        void operator=(const XiReactionRate&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/ddt2/ddt2.H b/src/functionObjects/field/ddt2/ddt2.H
index ea0043d518..cf50a8c1f2 100644
--- a/src/functionObjects/field/ddt2/ddt2.H
+++ b/src/functionObjects/field/ddt2/ddt2.H
@@ -135,10 +135,10 @@ class ddt2
         int process(const word& inputName);
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         ddt2(const ddt2&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ddt2&) = delete;
 
 
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.H b/src/functionObjects/field/externalCoupled/externalCoupled.H
index 6a1a566d34..d049aa1f05 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.H
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.H
@@ -288,10 +288,10 @@ private:
         //- Perform the coupling with necessary initialization etc.
         void performCoupling();
 
-        //- Disallow default bitwise copy constructor
+        //- No copy construct
         externalCoupled(const externalCoupled&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const externalCoupled&) = delete;
 
 
diff --git a/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H b/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H
index 4953795e61..412a722080 100644
--- a/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H
+++ b/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H
@@ -238,11 +238,11 @@ protected:
             const label globalFaceI
         ) const;
 
-        //- Disallow default bitwise copy construct
-        extractEulerianParticles(const extractEulerianParticles&);
+        //- No copy construct
+        extractEulerianParticles(const extractEulerianParticles&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const extractEulerianParticles&);
+        //- No copy assignment
+        void operator=(const extractEulerianParticles&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.H b/src/functionObjects/field/fieldAverage/fieldAverage.H
index b169bfa051..49a03b0572 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverage.H
+++ b/src/functionObjects/field/fieldAverage/fieldAverage.H
@@ -274,10 +274,10 @@ protected:
             void readAveragingProperties();
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         fieldAverage(const fieldAverage&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const fieldAverage&) = delete;
 
 
diff --git a/src/functionObjects/field/fieldExpression/fieldExpression.H b/src/functionObjects/field/fieldExpression/fieldExpression.H
index 8f1e263efc..5c219f4d37 100644
--- a/src/functionObjects/field/fieldExpression/fieldExpression.H
+++ b/src/functionObjects/field/fieldExpression/fieldExpression.H
@@ -84,11 +84,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fieldExpression(const fieldExpression&);
+        //- No copy construct
+        fieldExpression(const fieldExpression&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fieldExpression&);
+        //- No copy assignment
+        void operator=(const fieldExpression&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/functionObjects/field/fieldMinMax/fieldMinMax.H
index f92c1972c1..40e392f7ed 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -150,10 +150,10 @@ protected:
         //- Output file header information
         virtual void writeFileHeader(Ostream& os);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         fieldMinMax(const fieldMinMax&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const fieldMinMax&) = delete;
 
         //- Calculate the field min/max
diff --git a/src/functionObjects/field/fieldsExpression/fieldsExpression.H b/src/functionObjects/field/fieldsExpression/fieldsExpression.H
index da99ee331e..b17b7dda37 100644
--- a/src/functionObjects/field/fieldsExpression/fieldsExpression.H
+++ b/src/functionObjects/field/fieldsExpression/fieldsExpression.H
@@ -98,11 +98,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fieldsExpression(const fieldsExpression&);
+        //- No copy construct
+        fieldsExpression(const fieldsExpression&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fieldsExpression&);
+        //- No copy assignment
+        void operator=(const fieldsExpression&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.H b/src/functionObjects/field/fluxSummary/fluxSummary.H
index 8c5a3a5a75..1677d826a0 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.H
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.H
@@ -245,10 +245,10 @@ protected:
         //- Specialized write for surfaces
         bool surfaceModeWrite();
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         fluxSummary(const fluxSummary&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const fluxSummary&) = delete;
 
 
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.H b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.H
index 7496854c8f..2ad6e39957 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.H
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.H
@@ -144,10 +144,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         heatTransferCoeff(const heatTransferCoeff&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const heatTransferCoeff&) = delete;
 
 
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H
index ac68ddfd80..648211db45 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H
@@ -97,10 +97,10 @@ class ReynoldsAnalogy
 {
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         ReynoldsAnalogy(const ReynoldsAnalogy&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ReynoldsAnalogy&) = delete;
 
 
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/fixedReferenceTemperature/fixedReferenceTemperature.H b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/fixedReferenceTemperature/fixedReferenceTemperature.H
index 6e5c72903a..96b1c5eacc 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/fixedReferenceTemperature/fixedReferenceTemperature.H
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/fixedReferenceTemperature/fixedReferenceTemperature.H
@@ -83,10 +83,10 @@ class fixedReferenceTemperature
 {
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         fixedReferenceTemperature(const fixedReferenceTemperature&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const fixedReferenceTemperature&) = delete;
 
 
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/heatTransferCoeffModel/heatTransferCoeffModel.H b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/heatTransferCoeffModel/heatTransferCoeffModel.H
index b9ec3ee02a..b8efd0849a 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/heatTransferCoeffModel/heatTransferCoeffModel.H
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/heatTransferCoeffModel/heatTransferCoeffModel.H
@@ -64,10 +64,10 @@ class heatTransferCoeffModel
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         heatTransferCoeffModel(const heatTransferCoeffModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const heatTransferCoeffModel&) = delete;
 
 
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/localReferenceTemperature/localReferenceTemperature.H b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/localReferenceTemperature/localReferenceTemperature.H
index 2b1431d340..711196c5e3 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/localReferenceTemperature/localReferenceTemperature.H
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/localReferenceTemperature/localReferenceTemperature.H
@@ -81,10 +81,10 @@ class localReferenceTemperature
 {
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         localReferenceTemperature(const localReferenceTemperature&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const localReferenceTemperature&) = delete;
 
 
diff --git a/src/functionObjects/field/histogram/histogram.H b/src/functionObjects/field/histogram/histogram.H
index 38c6bf9aed..2cd206784a 100644
--- a/src/functionObjects/field/histogram/histogram.H
+++ b/src/functionObjects/field/histogram/histogram.H
@@ -125,11 +125,11 @@ class histogram
             const scalarField& absoluteValues
         ) const;
 
-        //- Disallow default bitwise copy construct
-        histogram(const histogram&);
+        //- No copy construct
+        histogram(const histogram&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const histogram&);
+        //- No copy assignment
+        void operator=(const histogram&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/mapFields/mapFields.H b/src/functionObjects/field/mapFields/mapFields.H
index 69ff1b15eb..fa5fc85151 100644
--- a/src/functionObjects/field/mapFields/mapFields.H
+++ b/src/functionObjects/field/mapFields/mapFields.H
@@ -103,10 +103,10 @@ class mapFields
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         mapFields(const mapFields&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const mapFields&) = delete;
 
         //- Helper function to create the mesh-to-mesh interpolation
diff --git a/src/functionObjects/field/nearWallFields/nearWallFields.H b/src/functionObjects/field/nearWallFields/nearWallFields.H
index 85c67d9b2d..d8a7efd050 100644
--- a/src/functionObjects/field/nearWallFields/nearWallFields.H
+++ b/src/functionObjects/field/nearWallFields/nearWallFields.H
@@ -175,11 +175,11 @@ protected:
 
 private:
 
-        //- Disallow default bitwise copy construct
-        nearWallFields(const nearWallFields&);
+        //- No copy construct
+        nearWallFields(const nearWallFields&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const nearWallFields&);
+        //- No copy assignment
+        void operator=(const nearWallFields&) = delete;
 
 public:
 
diff --git a/src/functionObjects/field/particleDistribution/particleDistribution.H b/src/functionObjects/field/particleDistribution/particleDistribution.H
index 4e7765e1b1..d4b5a352c2 100644
--- a/src/functionObjects/field/particleDistribution/particleDistribution.H
+++ b/src/functionObjects/field/particleDistribution/particleDistribution.H
@@ -133,10 +133,10 @@ protected:
             const List<DynamicList<label>>& addr
         );
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         particleDistribution(const particleDistribution&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const particleDistribution&) = delete;
 
 
diff --git a/src/functionObjects/field/processorField/processorField.H b/src/functionObjects/field/processorField/processorField.H
index 807d8f14c8..eacb0a8f60 100644
--- a/src/functionObjects/field/processorField/processorField.H
+++ b/src/functionObjects/field/processorField/processorField.H
@@ -85,11 +85,11 @@ class processorField
         Switch log_;
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        processorField(const processorField&);
+        //- No copy construct
+        processorField(const processorField&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const processorField&);
+        //- No copy assignment
+        void operator=(const processorField&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.H b/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.H
index 69bfce7ffb..e6142548e2 100644
--- a/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.H
+++ b/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.H
@@ -131,11 +131,14 @@ class reactionsSensitivityAnalysis
         void writeSpeciesRR();
 
 
-        //- Disallow default bitwise copy construct
-        reactionsSensitivityAnalysis(const reactionsSensitivityAnalysis&);
+        //- No copy construct
+        reactionsSensitivityAnalysis
+        (
+            const reactionsSensitivityAnalysis&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const reactionsSensitivityAnalysis&);
+        //- No copy assignment
+        void operator=(const reactionsSensitivityAnalysis&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/readFields/readFields.H b/src/functionObjects/field/readFields/readFields.H
index 1dfb662d5d..50bb32bdea 100644
--- a/src/functionObjects/field/readFields/readFields.H
+++ b/src/functionObjects/field/readFields/readFields.H
@@ -103,11 +103,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        readFields(const readFields&);
+        //- No copy construct
+        readFields(const readFields&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const readFields&);
+        //- No copy assignment
+        void operator=(const readFields&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index 86d4c938cc..1ab6800d10 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
@@ -279,11 +279,11 @@ class regionSizeDistribution
             const coordSet& coords              // graph data for bins
         ) const;
 
-        //- Disallow default bitwise copy construct
-        regionSizeDistribution(const regionSizeDistribution&);
+        //- No copy construct
+        regionSizeDistribution(const regionSizeDistribution&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const regionSizeDistribution&);
+        //- No copy assignment
+        void operator=(const regionSizeDistribution&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/streamLine/streamLine.H b/src/functionObjects/field/streamLine/streamLine.H
index f26af7c800..169c231349 100644
--- a/src/functionObjects/field/streamLine/streamLine.H
+++ b/src/functionObjects/field/streamLine/streamLine.H
@@ -138,10 +138,10 @@ class streamLine
 
    // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         streamLine(const streamLine&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const streamLine&) = delete;
 
 
diff --git a/src/functionObjects/field/streamLine/streamLineParticleCloud.H b/src/functionObjects/field/streamLine/streamLineParticleCloud.H
index dfe1461a7e..46fc7401e2 100644
--- a/src/functionObjects/field/streamLine/streamLineParticleCloud.H
+++ b/src/functionObjects/field/streamLine/streamLineParticleCloud.H
@@ -53,11 +53,11 @@ class streamLineParticleCloud
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        streamLineParticleCloud(const streamLineParticleCloud&);
+        //- No copy construct
+        streamLineParticleCloud(const streamLineParticleCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const streamLineParticleCloud&);
+        //- No copy assignment
+        void operator=(const streamLineParticleCloud&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H
index 136c6e39d6..853a0ce9fa 100644
--- a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H
+++ b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H
@@ -117,11 +117,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        surfaceInterpolate(const surfaceInterpolate&);
+        //- No copy construct
+        surfaceInterpolate(const surfaceInterpolate&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const surfaceInterpolate&);
+        //- No copy assignment
+        void operator=(const surfaceInterpolate&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.H b/src/functionObjects/field/turbulenceFields/turbulenceFields.H
index a4ae31d199..21bf9dffae 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFields.H
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.H
@@ -184,10 +184,10 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         turbulenceFields(const turbulenceFields&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const turbulenceFields&) = delete;
 
 
diff --git a/src/functionObjects/field/valueAverage/valueAverage.H b/src/functionObjects/field/valueAverage/valueAverage.H
index cb6ae974be..6aeb6b5a84 100644
--- a/src/functionObjects/field/valueAverage/valueAverage.H
+++ b/src/functionObjects/field/valueAverage/valueAverage.H
@@ -129,10 +129,10 @@ protected:
         //- Output file header information
         virtual void writeFileHeader(Ostream& os) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         valueAverage(const valueAverage&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const valueAverage&) = delete;
 
 
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
index dbec1b53e8..f4e70b88c6 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
@@ -125,10 +125,10 @@ class wallBoundedStreamLine
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         wallBoundedStreamLine(const wallBoundedStreamLine&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const wallBoundedStreamLine&) = delete;
 
 
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H
index dc270ffa0d..968c379d2b 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H
@@ -53,14 +53,14 @@ class wallBoundedStreamLineParticleCloud
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         wallBoundedStreamLineParticleCloud
         (
             const wallBoundedStreamLineParticleCloud&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const wallBoundedStreamLineParticleCloud&);
+        //- No copy assignment
+        void operator=(const wallBoundedStreamLineParticleCloud&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
index bfa3326956..51d2e72123 100644
--- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
+++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
@@ -121,11 +121,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        wallHeatFlux(const wallHeatFlux&);
+        //- No copy construct
+        wallHeatFlux(const wallHeatFlux&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const wallHeatFlux&);
+        //- No copy assignment
+        void operator=(const wallHeatFlux&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.H b/src/functionObjects/field/wallShearStress/wallShearStress.H
index b61ffac8c2..34ce7f990d 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.H
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.H
@@ -127,11 +127,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        wallShearStress(const wallShearStress&);
+        //- No copy construct
+        wallShearStress(const wallShearStress&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const wallShearStress&);
+        //- No copy assignment
+        void operator=(const wallShearStress&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/writeCellCentres/writeCellCentres.H b/src/functionObjects/field/writeCellCentres/writeCellCentres.H
index 2c3aca1b18..ecb4035f01 100644
--- a/src/functionObjects/field/writeCellCentres/writeCellCentres.H
+++ b/src/functionObjects/field/writeCellCentres/writeCellCentres.H
@@ -78,11 +78,11 @@ class writeCellCentres
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        writeCellCentres(const writeCellCentres&);
+        //- No copy construct
+        writeCellCentres(const writeCellCentres&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const writeCellCentres&);
+        //- No copy assignment
+        void operator=(const writeCellCentres&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H
index d1db19be84..0cd68f8b9b 100644
--- a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H
+++ b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H
@@ -77,11 +77,11 @@ class writeCellVolumes
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        writeCellVolumes(const writeCellVolumes&);
+        //- No copy construct
+        writeCellVolumes(const writeCellVolumes&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const writeCellVolumes&);
+        //- No copy assignment
+        void operator=(const writeCellVolumes&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/yPlus/yPlus.H b/src/functionObjects/field/yPlus/yPlus.H
index 76881db50e..5aa3696722 100644
--- a/src/functionObjects/field/yPlus/yPlus.H
+++ b/src/functionObjects/field/yPlus/yPlus.H
@@ -93,11 +93,11 @@ class yPlus
         //- File header information
         virtual void writeFileHeader(Ostream& os) const;
 
-        //- Disallow default bitwise copy construct
-        yPlus(const yPlus&);
+        //- No copy construct
+        yPlus(const yPlus&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const yPlus&);
+        //- No copy assignment
+        void operator=(const yPlus&) = delete;
 
 
 public:
diff --git a/src/functionObjects/field/zeroGradient/zeroGradient.H b/src/functionObjects/field/zeroGradient/zeroGradient.H
index 4747b2bf55..04f610648c 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradient.H
+++ b/src/functionObjects/field/zeroGradient/zeroGradient.H
@@ -126,10 +126,10 @@ class zeroGradient
         int process(const word& inputName);
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         zeroGradient(const zeroGradient&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const zeroGradient&) = delete;
 
 
diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/functionObjects/forces/forceCoeffs/forceCoeffs.H
index 78fa3a68e1..9c8e16e12e 100644
--- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.H
+++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.H
@@ -172,11 +172,11 @@ class forceCoeffs
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        forceCoeffs(const forceCoeffs&);
+        //- No copy construct
+        forceCoeffs(const forceCoeffs&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const forceCoeffs&);
+        //- No copy assignment
+        void operator=(const forceCoeffs&) = delete;
 
 
 protected:
diff --git a/src/functionObjects/forces/forces/forces.H b/src/functionObjects/forces/forces/forces.H
index 41d4aa6b6f..d899841258 100644
--- a/src/functionObjects/forces/forces/forces.H
+++ b/src/functionObjects/forces/forces/forces.H
@@ -346,11 +346,11 @@ protected:
         //- Write binned data
         void writeBins();
 
-        //- Disallow default bitwise copy construct
-        forces(const forces&);
+        //- No copy construct
+        forces(const forces&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const forces&);
+        //- No copy assignment
+        void operator=(const forces&) = delete;
 
 
 public:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H
index 3df00661a1..4f8341a619 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H
@@ -95,11 +95,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fieldVisualisationBase(const fieldVisualisationBase&);
+        //- No copy construct
+        fieldVisualisationBase(const fieldVisualisationBase&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fieldVisualisationBase&);
+        //- No copy assignment
+        void operator=(const fieldVisualisationBase&) = delete;
 
 
 protected:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectBase.H b/src/functionObjects/graphics/runTimePostProcessing/functionObjectBase.H
index 09515f3280..b04e44bb9b 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectBase.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectBase.H
@@ -59,11 +59,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        functionObjectBase(const functionObjectBase&);
+        //- No copy construct
+        functionObjectBase(const functionObjectBase&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const functionObjectBase&);
+        //- No copy assignment
+        void operator=(const functionObjectBase&) = delete;
 
 
 protected:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.H b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.H
index 35645965bc..e40489ef14 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.H
@@ -60,10 +60,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         functionObjectCloud(const functionObjectCloud&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const functionObjectCloud&) = delete;
 
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.H b/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.H
index f16dc25547..f4e31d0d95 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.H
@@ -60,10 +60,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         functionObjectLine(const functionObjectLine&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const functionObjectLine&) = delete;
 
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.H b/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.H
index 2ae627a6bf..f8176288c0 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.H
@@ -61,10 +61,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         functionObjectSurface(const functionObjectSurface&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const functionObjectSurface&) = delete;
 
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H
index 0e4bda758c..2ed82fe9c9 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H
@@ -82,11 +82,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        geometryBase(const geometryBase&);
+        //- No copy construct
+        geometryBase(const geometryBase&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const geometryBase&);
+        //- No copy assignment
+        void operator=(const geometryBase&) = delete;
 
 
 protected:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.H b/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.H
index 7aaf3af17a..634a5e4877 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.H
@@ -60,10 +60,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         geometrySurface(const geometrySurface&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const geometrySurface&) = delete;
 
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pathline.H b/src/functionObjects/graphics/runTimePostProcessing/pathline.H
index fb4893cb7e..7b452b48eb 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pathline.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/pathline.H
@@ -78,10 +78,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         pathline(const pathline&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const pathline&) = delete;
 
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pointData.H b/src/functionObjects/graphics/runTimePostProcessing/pointData.H
index 73f7b5f61d..7d81b5cca3 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pointData.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/pointData.H
@@ -76,10 +76,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         pointData(const pointData&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const pointData&) = delete;
 
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/scene.H b/src/functionObjects/graphics/runTimePostProcessing/scene.H
index ebf4694096..713831bd09 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/scene.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/scene.H
@@ -111,11 +111,11 @@ class scene
             const bool visible
         ) const;
 
-        //- Disallow default bitwise copy construct
-        scene(const scene&);
+        //- No copy construct
+        scene(const scene&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const scene&);
+        //- No copy assignment
+        void operator=(const scene&) = delete;
 
 
 protected:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/surface.H b/src/functionObjects/graphics/runTimePostProcessing/surface.H
index 3913087aa8..ce98897250 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/surface.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/surface.H
@@ -81,10 +81,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         surface(const surface&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const surface&) = delete;
 
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/text.H b/src/functionObjects/graphics/runTimePostProcessing/text.H
index 6d492d7b1b..551fcf6b7c 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/text.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/text.H
@@ -77,10 +77,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         text(const text&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const text&) = delete;
 
 
diff --git a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H
index 8660d7d708..d4dad2889c 100644
--- a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H
+++ b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H
@@ -112,11 +112,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        cloudInfo(const cloudInfo&);
+        //- No copy construct
+        cloudInfo(const cloudInfo&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cloudInfo&);
+        //- No copy assignment
+        void operator=(const cloudInfo&) = delete;
 
 
 public:
diff --git a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
index 4a2a676e6a..b2ce2a9adb 100644
--- a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
+++ b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
@@ -85,11 +85,11 @@ class dsmcFields
         Switch log_;
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        dsmcFields(const dsmcFields&);
+        //- No copy construct
+        dsmcFields(const dsmcFields&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dsmcFields&);
+        //- No copy assignment
+        void operator=(const dsmcFields&) = delete;
 
 
 public:
diff --git a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H
index 0244d177ee..37f0072d98 100644
--- a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H
+++ b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H
@@ -124,11 +124,11 @@ class icoUncoupledKinematicCloud
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        icoUncoupledKinematicCloud(const icoUncoupledKinematicCloud&);
+        //- No copy construct
+        icoUncoupledKinematicCloud(const icoUncoupledKinematicCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator==(const icoUncoupledKinematicCloud&);
+        //- No copy assignment
+        void operator==(const icoUncoupledKinematicCloud&) = delete;
 
 
 public:
diff --git a/src/functionObjects/solvers/energyTransport/energyTransport.H b/src/functionObjects/solvers/energyTransport/energyTransport.H
index 20fc569034..b9091869c6 100644
--- a/src/functionObjects/solvers/energyTransport/energyTransport.H
+++ b/src/functionObjects/solvers/energyTransport/energyTransport.H
@@ -269,10 +269,10 @@ class energyTransport
         //- Return kappa
         tmp<volScalarField> kappa() const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         energyTransport(const energyTransport&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const energyTransport&) = delete;
 
 
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.H b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
index 7633017c4a..df11dabe42 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.H
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
@@ -221,10 +221,10 @@ class scalarTransport
             const surfaceScalarField& phi
         ) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         scalarTransport(const scalarTransport&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const scalarTransport&) = delete;
 
 
diff --git a/src/functionObjects/utilities/abort/abort.H b/src/functionObjects/utilities/abort/abort.H
index ce88b6264c..10c1467557 100644
--- a/src/functionObjects/utilities/abort/abort.H
+++ b/src/functionObjects/utilities/abort/abort.H
@@ -89,10 +89,10 @@ class abort
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         abort(const abort&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const abort&) = delete;
 
 
diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
index 289043c15f..9a909f2613 100644
--- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
+++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
@@ -136,11 +136,11 @@ protected:
 
 private:
 
-        //- Disallow default bitwise copy construct
-        codedFunctionObject(const codedFunctionObject&);
+        //- No copy construct
+        codedFunctionObject(const codedFunctionObject&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const codedFunctionObject&);
+        //- No copy assignment
+        void operator=(const codedFunctionObject&) = delete;
 
 
 public:
diff --git a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
index 9a4024e3fd..42d3fe3282 100644
--- a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
+++ b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
@@ -86,11 +86,11 @@ class removeRegisteredObject
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        removeRegisteredObject(const removeRegisteredObject&);
+        //- No copy construct
+        removeRegisteredObject(const removeRegisteredObject&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const removeRegisteredObject&);
+        //- No copy assignment
+        void operator=(const removeRegisteredObject&) = delete;
 
 
 public:
diff --git a/src/functionObjects/utilities/residuals/residuals.H b/src/functionObjects/utilities/residuals/residuals.H
index 02e2db2843..63b43e5fc9 100644
--- a/src/functionObjects/utilities/residuals/residuals.H
+++ b/src/functionObjects/utilities/residuals/residuals.H
@@ -106,10 +106,10 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         residuals(const residuals&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const residuals&) = delete;
 
 
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeControl.H b/src/functionObjects/utilities/runTimeControl/runTimeControl.H
index 0b1daf3478..e3367ebbe6 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeControl.H
+++ b/src/functionObjects/utilities/runTimeControl/runTimeControl.H
@@ -83,11 +83,11 @@ class runTimeControl
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        runTimeControl(const runTimeControl&);
+        //- No copy construct
+        runTimeControl(const runTimeControl&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const runTimeControl&);
+        //- No copy assignment
+        void operator=(const runTimeControl&) = delete;
 
 
 public:
diff --git a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
index f331073336..fdeb447d0e 100644
--- a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
+++ b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
@@ -99,11 +99,11 @@ class setTimeStepFunctionObject
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        setTimeStepFunctionObject(const setTimeStepFunctionObject&);
+        //- No copy construct
+        setTimeStepFunctionObject(const setTimeStepFunctionObject&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const setTimeStepFunctionObject&);
+        //- No copy assignment
+        void operator=(const setTimeStepFunctionObject&) = delete;
 
 
 public:
diff --git a/src/functionObjects/utilities/systemCall/systemCall.H b/src/functionObjects/utilities/systemCall/systemCall.H
index 17f2c72f66..638fcf3bf0 100644
--- a/src/functionObjects/utilities/systemCall/systemCall.H
+++ b/src/functionObjects/utilities/systemCall/systemCall.H
@@ -131,10 +131,10 @@ protected:
         //- Dispatch specified calls
         label dispatch(const stringList& calls);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         systemCall(const systemCall&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const systemCall&) = delete;
 
 
diff --git a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H
index 47047b5183..7998b1f992 100644
--- a/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H
+++ b/src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.H
@@ -146,11 +146,11 @@ protected:
 
 private:
 
-        //- Disallow default bitwise copy construct
-        thermoCoupleProbes(const thermoCoupleProbes&);
+        //- No copy construct
+        thermoCoupleProbes(const thermoCoupleProbes&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const thermoCoupleProbes&);
+        //- No copy assignment
+        void operator=(const thermoCoupleProbes&) = delete;
 
 
 public:
diff --git a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
index 18db47c80a..421ee18148 100644
--- a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
+++ b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
@@ -115,11 +115,11 @@ class timeActivatedFileUpdate
         //- Update file
         void updateFile();
 
-        //- Disallow default bitwise copy construct
-        timeActivatedFileUpdate(const timeActivatedFileUpdate&);
+        //- No copy construct
+        timeActivatedFileUpdate(const timeActivatedFileUpdate&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const timeActivatedFileUpdate&);
+        //- No copy assignment
+        void operator=(const timeActivatedFileUpdate&) = delete;
 
 
 public:
diff --git a/src/functionObjects/utilities/writeDictionary/writeDictionary.H b/src/functionObjects/utilities/writeDictionary/writeDictionary.H
index 6f719601b0..8c53f6ae60 100644
--- a/src/functionObjects/utilities/writeDictionary/writeDictionary.H
+++ b/src/functionObjects/utilities/writeDictionary/writeDictionary.H
@@ -81,11 +81,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        writeDictionary(const writeDictionary&);
+        //- No copy construct
+        writeDictionary(const writeDictionary&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const writeDictionary&);
+        //- No copy assignment
+        void operator=(const writeDictionary&) = delete;
 
 
 public:
diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.H b/src/functionObjects/utilities/writeObjects/writeObjects.H
index 3b1bf7b121..ec25a9308a 100644
--- a/src/functionObjects/utilities/writeObjects/writeObjects.H
+++ b/src/functionObjects/utilities/writeObjects/writeObjects.H
@@ -137,10 +137,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         writeObjects(const writeObjects&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const writeObjects&) = delete;
 
 
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
index 34fe51a034..1051120b75 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
@@ -113,11 +113,11 @@ class MGridGenGAMGAgglomeration
         );
 
 
-        //- Disallow default bitwise copy construct
-        MGridGenGAMGAgglomeration(const MGridGenGAMGAgglomeration&);
+        //- No copy construct
+        MGridGenGAMGAgglomeration(const MGridGenGAMGAgglomeration&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const MGridGenGAMGAgglomeration&);
+        //- No copy assignment
+        void operator=(const MGridGenGAMGAgglomeration&) = delete;
 
 
 public:
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
index cbe74ac222..10c575bd61 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
@@ -130,11 +130,11 @@ private:
         //- Maps current level with base patch
         void mapBaseToTopAgglom(const label fineLevelIndex);
 
-        //- Disallow default bitwise copy construct
-        pairPatchAgglomeration(const pairPatchAgglomeration&);
+        //- No copy construct
+        pairPatchAgglomeration(const pairPatchAgglomeration&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pairPatchAgglomeration&);
+        //- No copy assignment
+        void operator=(const pairPatchAgglomeration&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
index 012cb6fd36..4b766053e3 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
@@ -82,14 +82,17 @@ class displacementComponentLaplacianFvMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementComponentLaplacianFvMotionSolver
         (
             const displacementComponentLaplacianFvMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const displacementComponentLaplacianFvMotionSolver&);
+        //- No copy assignment
+        void operator=
+        (
+            const displacementComponentLaplacianFvMotionSolver&
+        ) = delete;
 
         //- Return the component corresponding to the given component name
         direction cmpt(const word& cmptName) const;
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
index 591c275dde..094af903c5 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
@@ -74,14 +74,17 @@ class velocityComponentLaplacianFvMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         velocityComponentLaplacianFvMotionSolver
         (
             const velocityComponentLaplacianFvMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const velocityComponentLaplacianFvMotionSolver&);
+        //- No copy assignment
+        void operator=
+        (
+            const velocityComponentLaplacianFvMotionSolver&
+        ) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
index 7bd9737556..a33b39c780 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
@@ -74,14 +74,14 @@ class displacementSBRStressFvMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementSBRStressFvMotionSolver
         (
             const displacementSBRStressFvMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const displacementSBRStressFvMotionSolver&);
+        //- No copy assignment
+        void operator=(const displacementSBRStressFvMotionSolver&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
index 0c2fcef937..9158bcf27e 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
@@ -82,14 +82,14 @@ class displacementLaplacianFvMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementLaplacianFvMotionSolver
         (
             const displacementLaplacianFvMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const displacementLaplacianFvMotionSolver&);
+        //- No copy assignment
+        void operator=(const displacementLaplacianFvMotionSolver&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.H
index 2f768b51f7..5702f98329 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.H
@@ -56,7 +56,7 @@ class motionDiffusivity;
 class solidBodyMotionFunction;
 
 /*---------------------------------------------------------------------------*\
-             Class solidBodyDisplacementLaplacianFvMotionSolver Declaration
+        Class solidBodyDisplacementLaplacianFvMotionSolver Declaration
 \*---------------------------------------------------------------------------*/
 
 class solidBodyDisplacementLaplacianFvMotionSolver
@@ -89,14 +89,17 @@ class solidBodyDisplacementLaplacianFvMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         solidBodyDisplacementLaplacianFvMotionSolver
         (
             const solidBodyDisplacementLaplacianFvMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const solidBodyDisplacementLaplacianFvMotionSolver&);
+        //- No copy assignment
+        void operator=
+        (
+            const solidBodyDisplacementLaplacianFvMotionSolver&
+        ) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.H
index 0ef3b44abf..49db1d392b 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.H
@@ -141,14 +141,14 @@ class surfaceAlignedSBRStressFvMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         surfaceAlignedSBRStressFvMotionSolver
         (
             const surfaceAlignedSBRStressFvMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const surfaceAlignedSBRStressFvMotionSolver&);
+        //- No copy assignment
+        void operator=(const surfaceAlignedSBRStressFvMotionSolver&) = delete;
 
         //- Calculate cellRot
         void calculateCellRot();
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
index b4b302951a..4f848e5f3c 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
@@ -74,14 +74,14 @@ class velocityLaplacianFvMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         velocityLaplacianFvMotionSolver
         (
             const velocityLaplacianFvMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const velocityLaplacianFvMotionSolver&);
+        //- No copy assignment
+        void operator=(const velocityLaplacianFvMotionSolver&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H
index 2e83b37349..06383ec29d 100644
--- a/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H
@@ -57,11 +57,11 @@ class directionalDiffusivity
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        directionalDiffusivity(const directionalDiffusivity&);
+        //- No copy construct
+        directionalDiffusivity(const directionalDiffusivity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const directionalDiffusivity&);
+        //- No copy assignment
+        void operator=(const directionalDiffusivity&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H
index 8269bf449b..4b7082910b 100644
--- a/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H
@@ -63,11 +63,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fileDiffusivity(const fileDiffusivity&);
+        //- No copy construct
+        fileDiffusivity(const fileDiffusivity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fileDiffusivity&);
+        //- No copy assignment
+        void operator=(const fileDiffusivity&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
index 4a2a13fa30..38081ef909 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
@@ -61,11 +61,11 @@ class inverseDistanceDiffusivity
     // Private Member Functions
 
 
-        //- Disallow default bitwise copy construct
-        inverseDistanceDiffusivity(const inverseDistanceDiffusivity&);
+        //- No copy construct
+        inverseDistanceDiffusivity(const inverseDistanceDiffusivity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const inverseDistanceDiffusivity&);
+        //- No copy assignment
+        void operator=(const inverseDistanceDiffusivity&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H
index 0a5b6809ad..4336f341a7 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H
@@ -58,11 +58,14 @@ class inverseFaceDistanceDiffusivity
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        inverseFaceDistanceDiffusivity(const inverseFaceDistanceDiffusivity&);
+        //- No copy construct
+        inverseFaceDistanceDiffusivity
+        (
+            const inverseFaceDistanceDiffusivity&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const inverseFaceDistanceDiffusivity&);
+        //- No copy assignment
+        void operator=(const inverseFaceDistanceDiffusivity&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H
index 86f485dfba..b306fa81f3 100644
--- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H
@@ -59,11 +59,14 @@ class inversePointDistanceDiffusivity
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        inversePointDistanceDiffusivity(const inversePointDistanceDiffusivity&);
+        //- No copy construct
+        inversePointDistanceDiffusivity
+        (
+            const inversePointDistanceDiffusivity&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const inversePointDistanceDiffusivity&);
+        //- No copy assignment
+        void operator=(const inversePointDistanceDiffusivity&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H
index ee395f979f..c0684b9701 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H
@@ -52,11 +52,11 @@ class inverseVolumeDiffusivity
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        inverseVolumeDiffusivity(const inverseVolumeDiffusivity&);
+        //- No copy construct
+        inverseVolumeDiffusivity(const inverseVolumeDiffusivity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const inverseVolumeDiffusivity&);
+        //- No copy assignment
+        void operator=(const inverseVolumeDiffusivity&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H
index c9a7ea47a6..6e10e41e72 100644
--- a/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H
@@ -59,11 +59,11 @@ class exponentialDiffusivity
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        exponentialDiffusivity(const exponentialDiffusivity&);
+        //- No copy construct
+        exponentialDiffusivity(const exponentialDiffusivity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const exponentialDiffusivity&);
+        //- No copy assignment
+        void operator=(const exponentialDiffusivity&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H
index 05f0b3390c..267feedbad 100644
--- a/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H
@@ -58,11 +58,11 @@ class quadraticDiffusivity
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        quadraticDiffusivity(const quadraticDiffusivity&);
+        //- No copy construct
+        quadraticDiffusivity(const quadraticDiffusivity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const quadraticDiffusivity&);
+        //- No copy assignment
+        void operator=(const quadraticDiffusivity&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H
index 02925d9a06..efa9199819 100644
--- a/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H
@@ -57,11 +57,14 @@ class motionDirectionalDiffusivity
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        motionDirectionalDiffusivity(const motionDirectionalDiffusivity&);
+        //- No copy construct
+        motionDirectionalDiffusivity
+        (
+            const motionDirectionalDiffusivity&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const motionDirectionalDiffusivity&);
+        //- No copy assignment
+        void operator=(const motionDirectionalDiffusivity&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H
index e0da293f71..4ad4c39dd0 100644
--- a/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H
@@ -63,11 +63,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        uniformDiffusivity(const uniformDiffusivity&);
+        //- No copy construct
+        uniformDiffusivity(const uniformDiffusivity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const uniformDiffusivity&);
+        //- No copy assignment
+        void operator=(const uniformDiffusivity&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.H b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.H
index 3dc56983ab..7775523c3c 100644
--- a/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.H
+++ b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.H
@@ -58,11 +58,11 @@ class motionInterpolation
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        motionInterpolation(const motionInterpolation&);
+        //- No copy construct
+        motionInterpolation(const motionInterpolation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const motionInterpolation&);
+        //- No copy assignment
+        void operator=(const motionInterpolation&) = delete;
 
 
 public:
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
index 652794efa7..5ea535a8e5 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
@@ -122,9 +122,12 @@ private:
         //- Calculate displacement (w.r.t. points0()) to project onto surface
         void calcProjection(vectorField& displacement) const;
 
+        //- No copy assignment
+        void operator=
+        (
+            const surfaceDisplacementPointPatchVectorField&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const surfaceDisplacementPointPatchVectorField&);
 
 public:
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
index d6de719e54..007cfcf990 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
@@ -112,8 +112,11 @@ private:
         //- Calculate displacement (w.r.t. points0()) to project onto surface
         void calcProjection(vectorField& displacement) const;
 
-        //- Disallow default bitwise assignment
-        void operator=(const surfaceSlipDisplacementPointPatchVectorField&);
+        //- No copy assignment
+        void operator=
+        (
+            const surfaceSlipDisplacementPointPatchVectorField&
+        ) = delete;
 
 
 public:
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index 00c83396eb..2fde4bda9a 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -111,11 +111,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fixedTemperatureConstraint(const fixedTemperatureConstraint&);
+        //- No copy construct
+        fixedTemperatureConstraint(const fixedTemperatureConstraint&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fixedTemperatureConstraint&);
+        //- No copy assignment
+        void operator=(const fixedTemperatureConstraint&) = delete;
 
 
 public:
diff --git a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
index cfc69515f8..3c8fda4672 100644
--- a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
+++ b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
@@ -93,11 +93,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        velocityDampingConstraint(const velocityDampingConstraint&);
+        //- No copy construct
+        velocityDampingConstraint(const velocityDampingConstraint&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const velocityDampingConstraint&);
+        //- No copy assignment
+        void operator=(const velocityDampingConstraint&) = delete;
 
 
 public:
diff --git a/src/fvOptions/corrections/limitTemperature/limitTemperature.H b/src/fvOptions/corrections/limitTemperature/limitTemperature.H
index 338a6554d9..e92e89f72c 100644
--- a/src/fvOptions/corrections/limitTemperature/limitTemperature.H
+++ b/src/fvOptions/corrections/limitTemperature/limitTemperature.H
@@ -90,11 +90,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        limitTemperature(const limitTemperature&);
+        //- No copy construct
+        limitTemperature(const limitTemperature&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const limitTemperature&);
+        //- No copy assignment
+        void operator=(const limitTemperature&) = delete;
 
 
 public:
diff --git a/src/fvOptions/corrections/limitVelocity/limitVelocity.H b/src/fvOptions/corrections/limitVelocity/limitVelocity.H
index 15ff1a8b6a..b3d192fa8a 100644
--- a/src/fvOptions/corrections/limitVelocity/limitVelocity.H
+++ b/src/fvOptions/corrections/limitVelocity/limitVelocity.H
@@ -81,11 +81,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        limitVelocity(const limitVelocity&);
+        //- No copy construct
+        limitVelocity(const limitVelocity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const limitVelocity&);
+        //- No copy assignment
+        void operator=(const limitVelocity&) = delete;
 
 
 public:
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H
index 02a283bf2d..08aaba8089 100644
--- a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H
@@ -106,10 +106,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        acousticDampingSource(const acousticDampingSource&);
+        //- No copy construct
+        acousticDampingSource(const acousticDampingSource&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const acousticDampingSource&) = delete;
 
 
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
index c8fb363781..36747410cf 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
@@ -127,11 +127,11 @@ private:
             const vectorField& U
         ) const;
 
-        //- Disallow default bitwise copy construct
-        actuationDiskSource(const actuationDiskSource&);
+        //- No copy construct
+        actuationDiskSource(const actuationDiskSource&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const actuationDiskSource&);
+        //- No copy assignment
+        void operator=(const actuationDiskSource&) = delete;
 
 
 public:
diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H
index 192290494d..c7e1d8c933 100644
--- a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H
+++ b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H
@@ -71,11 +71,11 @@ class buoyancyEnergy
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        buoyancyEnergy(const buoyancyEnergy&);
+        //- No copy construct
+        buoyancyEnergy(const buoyancyEnergy&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const buoyancyEnergy&);
+        //- No copy assignment
+        void operator=(const buoyancyEnergy&) = delete;
 
 
 public:
diff --git a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H
index 6bc681d034..a2799a5a64 100644
--- a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H
+++ b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H
@@ -70,11 +70,11 @@ class buoyancyForce
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        buoyancyForce(const buoyancyForce&);
+        //- No copy construct
+        buoyancyForce(const buoyancyForce&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const buoyancyForce&);
+        //- No copy assignment
+        void operator=(const buoyancyForce&) = delete;
 
 
 public:
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
index d4cfaf63a8..f541089ca9 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
@@ -191,14 +191,17 @@ private:
         //- Correct driving force for a constant mass flow rate
         void update(fvMatrix<vector>& eqn);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         directionalPressureGradientExplicitSource
         (
             const directionalPressureGradientExplicitSource&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const directionalPressureGradientExplicitSource&);
+        //- No copy assignment
+        void operator=
+        (
+            const directionalPressureGradientExplicitSource&
+        ) = delete;
 
 
 public:
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
index e64bfce429..b6c68b9017 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
@@ -228,14 +228,14 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         effectivenessHeatExchangerSource
         (
             const effectivenessHeatExchangerSource&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const effectivenessHeatExchangerSource&);
+        //- No copy assignment
+        void operator=(const effectivenessHeatExchangerSource&) = delete;
 
         //- Initialise heat exchanger source model
         void initialise();
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
index 576fac6843..8cad83e0c5 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
@@ -102,11 +102,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        explicitPorositySource(const explicitPorositySource&);
+        //- No copy construct
+        explicitPorositySource(const explicitPorositySource&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const explicitPorositySource&);
+        //- No copy assignment
+        void operator=(const explicitPorositySource&) = delete;
 
 
 public:
diff --git a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H
index 2d125c7703..4842cfa1ed 100644
--- a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H
+++ b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H
@@ -188,11 +188,11 @@ class jouleHeatingSource
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        jouleHeatingSource(const jouleHeatingSource&);
+        //- No copy construct
+        jouleHeatingSource(const jouleHeatingSource&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const jouleHeatingSource&);
+        //- No copy assignment
+        void operator=(const jouleHeatingSource&) = delete;
 
         //- Return the co-ordinate system for anisotropic electrical
         //  conductivity
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
index 5f2cb2648c..fac0740aed 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
@@ -112,11 +112,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        meanVelocityForce(const meanVelocityForce&);
+        //- No copy construct
+        meanVelocityForce(const meanVelocityForce&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const meanVelocityForce&);
+        //- No copy assignment
+        void operator=(const meanVelocityForce&) = delete;
 
 
 public:
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H
index 75b175def6..a894757066 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H
+++ b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H
@@ -87,11 +87,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        patchMeanVelocityForce(const patchMeanVelocityForce&);
+        //- No copy construct
+        patchMeanVelocityForce(const patchMeanVelocityForce&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const patchMeanVelocityForce&);
+        //- No copy assignment
+        void operator=(const patchMeanVelocityForce&) = delete;
 
 
 public:
diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
index 3f0329e405..55e8fa9b4f 100644
--- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
+++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
@@ -112,11 +112,11 @@ class radialActuationDiskSource
             const vectorField& U
         ) const;
 
-        //- Disallow default bitwise copy construct
-        radialActuationDiskSource(const radialActuationDiskSource&);
+        //- No copy construct
+        radialActuationDiskSource(const radialActuationDiskSource&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const radialActuationDiskSource&);
+        //- No copy assignment
+        void operator=(const radialActuationDiskSource&) = delete;
 
 
 public:
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
index 7c3b576a30..256142c8c1 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
@@ -190,11 +190,14 @@ private:
         template<class RhoFieldType>
         void apply(const RhoFieldType& rho, fvMatrix<scalar>& eqn);
 
-        //- Disallow default bitwise copy construct
-        solidificationMeltingSource(const solidificationMeltingSource&);
+        //- No copy construct
+        solidificationMeltingSource
+        (
+            const solidificationMeltingSource&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const solidificationMeltingSource&);
+        //- No copy assignment
+        void operator=(const solidificationMeltingSource&) = delete;
 
 
 public:
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.H b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.H
index 80f956efcf..af7a4bcc25 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.H
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.H
@@ -74,11 +74,11 @@ class tabulated6DoFAcceleration
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        tabulated6DoFAcceleration(const tabulated6DoFAcceleration&);
+        //- No copy construct
+        tabulated6DoFAcceleration(const tabulated6DoFAcceleration&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const tabulated6DoFAcceleration&);
+        //- No copy assignment
+        void operator=(const tabulated6DoFAcceleration&) = delete;
 
 
 public:
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H
index 0a9b561955..3c8d8b1eb1 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H
@@ -87,11 +87,14 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        tabulatedAccelerationSource(const tabulatedAccelerationSource&);
+        //- No copy construct
+        tabulatedAccelerationSource
+        (
+            const tabulatedAccelerationSource&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const tabulatedAccelerationSource&);
+        //- No copy assignment
+        void operator=(const tabulatedAccelerationSource&) = delete;
 
 
         //- Source term to momentum equation
diff --git a/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.H b/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.H
index 5902080125..ef1497f1a9 100644
--- a/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.H
+++ b/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.H
@@ -80,10 +80,10 @@ class viscousDissipation
         //- Return the viscosity field
         tmp<volSymmTensorField> devRhoReff() const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         viscousDissipation(const viscousDissipation&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const viscousDissipation&) = delete;
 
 private:
diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
index e42e29d3db..36884d260b 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
@@ -111,14 +111,14 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         interRegionExplicitPorositySource
         (
             const interRegionExplicitPorositySource&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const interRegionExplicitPorositySource&);
+        //- No copy assignment
+        void operator=(const interRegionExplicitPorositySource&) = delete;
 
 
 public:
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
index d03a26f53f..5041b5d5f3 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
@@ -182,11 +182,11 @@ class DSMCCloud
         //- Calculate the volume field data
         void calculateFields();
 
-        //- Disallow default bitwise copy construct
-        DSMCCloud(const DSMCCloud&);
+        //- No copy construct
+        DSMCCloud(const DSMCCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const DSMCCloud&);
+        //- No copy assignment
+        void operator=(const DSMCCloud&) = delete;
 
 
 public:
diff --git a/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H b/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H
index 674774af37..56b0b19fca 100644
--- a/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H
+++ b/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H
@@ -50,11 +50,11 @@ class DSMCBaseCloud
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        DSMCBaseCloud(const DSMCBaseCloud&);
+        //- No copy construct
+        DSMCBaseCloud(const DSMCBaseCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const DSMCBaseCloud&);
+        //- No copy assignment
+        void operator=(const DSMCBaseCloud&) = delete;
 
 
 public:
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.H b/src/lagrangian/basic/InteractionLists/InteractionLists.H
index f44a17ead5..b7f8a550a4 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.H
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.H
@@ -198,11 +198,11 @@ class InteractionLists
         //- Write the referred wall faces out for debug
         void writeReferredWallFaces() const;
 
-        //- Disallow default bitwise copy construct
-        InteractionLists(const InteractionLists&);
+        //- No copy construct
+        InteractionLists(const InteractionLists&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const InteractionLists&);
+        //- No copy assignment
+        void operator=(const InteractionLists&) = delete;
 
 
 public:
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
index 270dcfe1d3..9ad85aa9f9 100644
--- a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
+++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
@@ -53,11 +53,11 @@ class indexedParticleCloud
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        indexedParticleCloud(const indexedParticleCloud&);
+        //- No copy construct
+        indexedParticleCloud(const indexedParticleCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const indexedParticleCloud&);
+        //- No copy assignment
+        void operator=(const indexedParticleCloud&) = delete;
 
 
 public:
diff --git a/src/lagrangian/basic/injectedParticle/injectedParticleCloud.H b/src/lagrangian/basic/injectedParticle/injectedParticleCloud.H
index 4c171fad9b..927a3de195 100644
--- a/src/lagrangian/basic/injectedParticle/injectedParticleCloud.H
+++ b/src/lagrangian/basic/injectedParticle/injectedParticleCloud.H
@@ -58,11 +58,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        injectedParticleCloud(const injectedParticleCloud&);
+        //- No copy construct
+        injectedParticleCloud(const injectedParticleCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const injectedParticleCloud&);
+        //- No copy assignment
+        void operator=(const injectedParticleCloud&) = delete;
 
 
 public:
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
index 3817b8c634..84e47c78de 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
+++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
@@ -53,11 +53,11 @@ class passiveParticleCloud
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        passiveParticleCloud(const passiveParticleCloud&);
+        //- No copy construct
+        passiveParticleCloud(const passiveParticleCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const passiveParticleCloud&);
+        //- No copy assignment
+        void operator=(const passiveParticleCloud&) = delete;
 
 
 public:
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
index 88326f8c2b..feb5f4e0d6 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
@@ -120,8 +120,8 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const IntegrationScheme&);
+        //- No copy assignment
+        void operator=(const IntegrationScheme&) = delete;
 
 
 public:
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
index 84a2b28766..a3a5e55573 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
@@ -89,11 +89,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        CollidingCloud(const CollidingCloud&);
+        //- No copy construct
+        CollidingCloud(const CollidingCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const CollidingCloud&);
+        //- No copy assignment
+        void operator=(const CollidingCloud&) = delete;
 
 
 protected:
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index fdfb60c087..5e91cb2fc0 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -133,11 +133,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        KinematicCloud(const KinematicCloud&);
+        //- No copy construct
+        KinematicCloud(const KinematicCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const KinematicCloud&);
+        //- No copy assignment
+        void operator=(const KinematicCloud&) = delete;
 
 
 protected:
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
index 36915ca289..e39743348f 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
@@ -108,8 +108,8 @@ class cloudSolution
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const cloudSolution&);
+        //- No copy assignment
+        void operator=(const cloudSolution&) = delete;
 
 
 public:
diff --git a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H
index 6ac4cd073e..28d272c8f4 100644
--- a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H
@@ -95,11 +95,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        MPPICCloud(const MPPICCloud&);
+        //- No copy construct
+        MPPICCloud(const MPPICCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const MPPICCloud&);
+        //- No copy assignment
+        void operator=(const MPPICCloud&) = delete;
 
 
 protected:
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 22ab3b5b38..7f6f29cf7f 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -92,11 +92,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        ReactingCloud(const ReactingCloud&);
+        //- No copy construct
+        ReactingCloud(const ReactingCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const ReactingCloud&);
+        //- No copy assignment
+        void operator=(const ReactingCloud&) = delete;
 
 
 protected:
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 66dd19b9d2..86335508ef 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -93,11 +93,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        ReactingMultiphaseCloud(const ReactingMultiphaseCloud&);
+        //- No copy construct
+        ReactingMultiphaseCloud(const ReactingMultiphaseCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const ReactingMultiphaseCloud&);
+        //- No copy assignment
+        void operator=(const ReactingMultiphaseCloud&) = delete;
 
 
 protected:
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index 158d8a849a..89dd19e676 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -90,11 +90,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        ThermoCloud(const ThermoCloud&);
+        //- No copy construct
+        ThermoCloud(const ThermoCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const ThermoCloud&);
+        //- No copy assignment
+        void operator=(const ThermoCloud&) = delete;
 
 
 protected:
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
index 675f09e6bd..2230ff697c 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
@@ -51,11 +51,11 @@ class kinematicCloud
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        kinematicCloud(const kinematicCloud&);
+        //- No copy construct
+        kinematicCloud(const kinematicCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const kinematicCloud&);
+        //- No copy assignment
+        void operator=(const kinematicCloud&) = delete;
 
 
 public:
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
index 72461bb2c9..eef644846b 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
@@ -50,11 +50,11 @@ class reactingCloud
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        reactingCloud(const reactingCloud&);
+        //- No copy construct
+        reactingCloud(const reactingCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const reactingCloud&);
+        //- No copy assignment
+        void operator=(const reactingCloud&) = delete;
 
 
 public:
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
index d7c0dea283..074dcc56c0 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
@@ -50,11 +50,11 @@ class reactingMultiphaseCloud
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        reactingMultiphaseCloud(const reactingMultiphaseCloud&);
+        //- No copy construct
+        reactingMultiphaseCloud(const reactingMultiphaseCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const reactingMultiphaseCloud&);
+        //- No copy assignment
+        void operator=(const reactingMultiphaseCloud&) = delete;
 
 
 public:
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
index 2743f57cf8..8f52deebd3 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
@@ -50,11 +50,11 @@ class thermoCloud
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        thermoCloud(const thermoCloud&);
+        //- No copy construct
+        thermoCloud(const thermoCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const thermoCloud&);
+        //- No copy assignment
+        void operator=(const thermoCloud&) = delete;
 
 
 public:
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H
index 151bdd3384..b0328f2d40 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H
@@ -57,8 +57,8 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const CorrectionLimitingMethod&);
+        //- No copy assignment
+        void operator=(const CorrectionLimitingMethod&) = delete;
 
 
 public:
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H
index a27c863bd0..093ae508f5 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H
@@ -58,8 +58,8 @@ private:
 
     //- Private member functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const ParticleStressModel&);
+        //- No copy assignment
+        void operator=(const ParticleStressModel&) = delete;
 
 
 protected:
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.H b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.H
index e77db57f0b..50f3513e18 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.H
@@ -59,8 +59,8 @@ private:
 
     //- Private member functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const TimeScaleModel&);
+        //- No copy assignment
+        void operator=(const TimeScaleModel&) = delete;
 
 
 protected:
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
index 99647b4c2a..be990d7671 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
@@ -80,11 +80,11 @@ class correlationFunction
 
         void setTimesAndSizes(const label);
 
-        //- Disallow default bitwise copy construct
-        correlationFunction(const correlationFunction<Type>&);
+        //- No copy construct
+        correlationFunction(const correlationFunction<Type>&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const correlationFunction<Type>&);
+        //- No copy assignment
+        void operator=(const correlationFunction<Type>&) = delete;
 
 
 public:
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
index 4dda921e89..15b269ff12 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
@@ -134,11 +134,11 @@ private:
             const molecule::constantProperties& cP
         );
 
-        //- Disallow default bitwise copy construct
-        moleculeCloud(const moleculeCloud&);
+        //- No copy construct
+        moleculeCloud(const moleculeCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const moleculeCloud&);
+        //- No copy assignment
+        void operator=(const moleculeCloud&) = delete;
 
 
 public:
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
index 5ce30a1d60..2f424424bb 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
@@ -27,7 +27,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const  Foam::scalar Foam::reducedUnits::kb = 1.3806504e-23;
+const Foam::scalar Foam::reducedUnits::kb = 1.3806504e-23;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -105,12 +105,6 @@ Foam::reducedUnits::reducedUnits(const IOdictionary& reducedUnitsDict)
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::reducedUnits::~reducedUnits()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::reducedUnits::setRefValues
@@ -121,9 +115,7 @@ void Foam::reducedUnits::setRefValues
 )
 {
     refLength_ = refLength;
-
     refTime_ = refTime;
-
     refMass_ = refMass;
 
     calcRefValues();
@@ -136,27 +128,11 @@ void Foam::reducedUnits::setRefValues
 )
 {
     refLength_ = readScalar(reducedUnitsDict.lookup("refLength"));
-
     refTime_ = readScalar(reducedUnitsDict.lookup("refTime"));
-
-    refMass_  = readScalar(reducedUnitsDict.lookup("refMass"));
+    refMass_ = readScalar(reducedUnitsDict.lookup("refMass"));
 
     calcRefValues();
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-void Foam::reducedUnits::operator=(const reducedUnits& rhs)
-{
-    // Check for assignment to self
-    if (this == &rhs)
-    {
-        FatalErrorInFunction
-            << "Attempted assignment to self"
-            << abort(FatalError);
-    }
-}
-
-
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
index 51c713a5b3..53c5c6ccd6 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
@@ -44,7 +44,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
 
 class reducedUnits;
 
@@ -59,45 +59,37 @@ class reducedUnits
 {
     // Private data
 
-        // Reduced units
+        // Fundamental values
 
-            // Fundamental values
+            scalar refLength_;
 
-                scalar refLength_;
+            scalar refTime_;
 
-                scalar refTime_;
+            scalar refMass_;
 
-                scalar refMass_;
+        // Derived values
 
-            // Derived values
+            scalar refEnergy_;
 
-                scalar refEnergy_;
+            scalar refTemp_;
 
-                scalar refTemp_;
+            scalar refForce_;
 
-                scalar refForce_;
+            scalar refVelocity_;
 
-                scalar refVelocity_;
+            scalar refVolume_;
 
-                scalar refVolume_;
+            scalar refPressure_;
 
-                scalar refPressure_;
+            scalar refMassDensity_;
 
-                scalar refMassDensity_;
-
-                scalar refNumberDensity_;
+            scalar refNumberDensity_;
 
 
     // Private Member Functions
 
         void calcRefValues();
 
-        //- Disallow default bitwise copy construct
-        reducedUnits(const reducedUnits&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const reducedUnits&);
-
 
 public:
 
@@ -128,7 +120,7 @@ public:
 
 
     //- Destructor
-    ~reducedUnits();
+    ~reducedUnits() = default;
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
index 4bdea8fb94..91ca39af0c 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
@@ -66,11 +66,11 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        energyScalingFunction(const energyScalingFunction&);
+        //- No copy construct
+        energyScalingFunction(const energyScalingFunction&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const energyScalingFunction&);
+        //- No copy assignment
+        void operator=(const energyScalingFunction&) = delete;
 
 
 public:
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
index cafa9a49a3..c950acd8cd 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
@@ -83,11 +83,11 @@ protected:
 
         void scaleEnergy(scalar& e, const scalar r) const;
 
-        //- Disallow copy construct
-        pairPotential(const pairPotential&);
+        //- No copy construct
+        pairPotential(const pairPotential&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pairPotential&);
+        //- No copy assignment
+        void operator=(const pairPotential&) = delete;
 
 
 public:
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
index 553c278984..f19f61d8f8 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
@@ -79,11 +79,11 @@ class pairPotentialList
             const polyMesh& mesh
         );
 
-        //- Disallow default bitwise assignment
-        void operator=(const pairPotentialList&);
+        //- No copy construct
+        pairPotentialList(const pairPotentialList&) = delete;
 
-        //- Disallow default bitwise copy construct
-        pairPotentialList(const pairPotentialList&);
+        //- No copy assignment
+        void operator=(const pairPotentialList&) = delete;
 
 
 public:
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.H b/src/lagrangian/molecularDynamics/potential/potential/potential.H
index b75644195e..c37fd2b45f 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.H
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.H
@@ -86,11 +86,11 @@ class potential
             IOdictionary& idListDict
         );
 
-        //- Disallow default bitwise copy construct
-        potential(const potential&);
+        //- No copy construct
+        potential(const potential&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const potential&);
+        //- No copy assignment
+        void operator=(const potential&) = delete;
 
 
 public:
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
index 6fdfca091e..0e56e27013 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
@@ -63,11 +63,11 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        tetherPotential(const tetherPotential&);
+        //- No copy construct
+        tetherPotential(const tetherPotential&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const tetherPotential&);
+        //- No copy assignment
+        void operator=(const tetherPotential&) = delete;
 
 
 public:
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
index dfbfc855a0..9d60fc2887 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
@@ -71,11 +71,11 @@ class tetherPotentialList
             const List<word>& tetherSiteIdList
         );
 
-        //- Disallow default bitwise assignment
-        void operator=(const tetherPotentialList&);
+        //- No copy construct
+        tetherPotentialList(const tetherPotentialList&) = delete;
 
-        //- Disallow default bitwise copy construct
-        tetherPotentialList(const tetherPotentialList&);
+        //- No copy assignment
+        void operator=(const tetherPotentialList&) = delete;
 
 
 public:
diff --git a/src/lagrangian/solidParticle/solidParticleCloud.H b/src/lagrangian/solidParticle/solidParticleCloud.H
index 13f9d7fc3f..d891127c71 100644
--- a/src/lagrangian/solidParticle/solidParticleCloud.H
+++ b/src/lagrangian/solidParticle/solidParticleCloud.H
@@ -70,11 +70,11 @@ class solidParticleCloud
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        solidParticleCloud(const solidParticleCloud&);
+        //- No copy construct
+        solidParticleCloud(const solidParticleCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const solidParticleCloud&);
+        //- No copy assignment
+        void operator=(const solidParticleCloud&) = delete;
 
 
 public:
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
index 6c0fa9f44f..6df5d85dc7 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
@@ -87,11 +87,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        SprayCloud(const SprayCloud&);
+        //- No copy construct
+        SprayCloud(const SprayCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const SprayCloud&);
+        //- No copy assignment
+        void operator=(const SprayCloud&) = delete;
 
 
 protected:
diff --git a/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H b/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H
index 469aa48c3f..13e7dde0f8 100644
--- a/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H
+++ b/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H
@@ -50,11 +50,11 @@ class sprayCloud
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        sprayCloud(const sprayCloud&);
+        //- No copy construct
+        sprayCloud(const sprayCloud&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const sprayCloud&);
+        //- No copy assignment
+        void operator=(const sprayCloud&) = delete;
 
 
 public:
diff --git a/src/lumpedPointMotion/lumpedPointIOMovement.H b/src/lumpedPointMotion/lumpedPointIOMovement.H
index f1f121b74b..4592202c86 100644
--- a/src/lumpedPointMotion/lumpedPointIOMovement.H
+++ b/src/lumpedPointMotion/lumpedPointIOMovement.H
@@ -60,10 +60,10 @@ class lumpedPointIOMovement
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         lumpedPointIOMovement(const lumpedPointIOMovement&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const lumpedPointIOMovement&) = delete;
 
 public:
diff --git a/src/lumpedPointMotion/lumpedPointMovement.H b/src/lumpedPointMotion/lumpedPointMovement.H
index 7587ec8378..997bb70cff 100644
--- a/src/lumpedPointMotion/lumpedPointMovement.H
+++ b/src/lumpedPointMotion/lumpedPointMovement.H
@@ -176,10 +176,10 @@ private:
         label threshold(scalar pos) const;
 
 
-        //- Disallow default bitwise copy constructor
+        //- No copy construct
         lumpedPointMovement(const lumpedPointMovement&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const lumpedPointMovement&) = delete;
 
 public:
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
index e4d3b72cb9..1a86c4ae78 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
@@ -129,8 +129,8 @@ class blockDescriptor
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const blockDescriptor&);
+        //- No copy assignment
+        void operator=(const blockDescriptor&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blockEdges/BSplineEdge/BSpline.H b/src/mesh/blockMesh/blockEdges/BSplineEdge/BSpline.H
index 116fba67da..fb7f098a90 100644
--- a/src/mesh/blockMesh/blockEdges/BSplineEdge/BSpline.H
+++ b/src/mesh/blockMesh/blockEdges/BSplineEdge/BSpline.H
@@ -77,11 +77,11 @@ class BSpline
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        BSpline(const BSpline&);
+        //- No copy construct
+        BSpline(const BSpline&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const BSpline&);
+        //- No copy assignment
+        void operator=(const BSpline&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H b/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H
index 55b7ae98a0..055281c66e 100644
--- a/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H
+++ b/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H
@@ -56,11 +56,11 @@ class BSplineEdge
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        BSplineEdge(const BSplineEdge&);
+        //- No copy construct
+        BSplineEdge(const BSplineEdge&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const BSplineEdge&);
+        //- No copy assignment
+        void operator=(const BSplineEdge&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
index 1521bd0a01..078b8bd548 100644
--- a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
+++ b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
@@ -66,11 +66,11 @@ class arcEdge
         //- Calculate the coordinate system, angle and radius
         cylindricalCS calcAngle();
 
-        //- Disallow default bitwise copy construct
-        arcEdge(const arcEdge&);
+        //- No copy construct
+        arcEdge(const arcEdge&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const arcEdge&);
+        //- No copy assignment
+        void operator=(const arcEdge&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blockEdges/bezier/bezier.H b/src/mesh/blockMesh/blockEdges/bezier/bezier.H
index 92c718e804..ef7105a493 100644
--- a/src/mesh/blockMesh/blockEdges/bezier/bezier.H
+++ b/src/mesh/blockMesh/blockEdges/bezier/bezier.H
@@ -69,11 +69,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        bezier(const bezier&);
+        //- No copy construct
+        bezier(const bezier&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const bezier&);
+        //- No copy assignment
+        void operator=(const bezier&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.H b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.H
index ab2927f413..90e9a094f3 100644
--- a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.H
+++ b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.H
@@ -55,11 +55,11 @@ class polyLine
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        polyLine(const polyLine&);
+        //- No copy construct
+        polyLine(const polyLine&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const polyLine&);
+        //- No copy assignment
+        void operator=(const polyLine&) = delete;
 
 
 protected:
diff --git a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H
index cb1165a746..09431929f5 100644
--- a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H
+++ b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H
@@ -56,11 +56,11 @@ class polyLineEdge
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        polyLineEdge(const polyLineEdge&);
+        //- No copy construct
+        polyLineEdge(const polyLineEdge&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const polyLineEdge&);
+        //- No copy assignment
+        void operator=(const polyLineEdge&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.H b/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.H
index 27d7f7ffca..02a9441a6c 100644
--- a/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.H
+++ b/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.H
@@ -63,11 +63,11 @@ class projectCurveEdge
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        projectCurveEdge(const projectCurveEdge&);
+        //- No copy construct
+        projectCurveEdge(const projectCurveEdge&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const projectCurveEdge&);
+        //- No copy assignment
+        void operator=(const projectCurveEdge&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.H b/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.H
index 320f658eb5..5c50c1e4e0 100644
--- a/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.H
+++ b/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.H
@@ -66,11 +66,11 @@ class projectEdge
         //- Single point find nearest
         void findNearest(const point&, point& near, pointConstraint&) const;
 
-        //- Disallow default bitwise copy construct
-        projectEdge(const projectEdge&);
+        //- No copy construct
+        projectEdge(const projectEdge&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const projectEdge&);
+        //- No copy assignment
+        void operator=(const projectEdge&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blockEdges/splineEdge/CatmullRomSpline.H b/src/mesh/blockMesh/blockEdges/splineEdge/CatmullRomSpline.H
index fda446f44f..a388b67613 100644
--- a/src/mesh/blockMesh/blockEdges/splineEdge/CatmullRomSpline.H
+++ b/src/mesh/blockMesh/blockEdges/splineEdge/CatmullRomSpline.H
@@ -79,11 +79,11 @@ class CatmullRomSpline
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        CatmullRomSpline(const CatmullRomSpline&);
+        //- No copy construct
+        CatmullRomSpline(const CatmullRomSpline&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const CatmullRomSpline&);
+        //- No copy assignment
+        void operator=(const CatmullRomSpline&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H b/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H
index 3396166ca7..eeac0d74ed 100644
--- a/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H
+++ b/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H
@@ -56,11 +56,11 @@ class splineEdge
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        splineEdge(const splineEdge&);
+        //- No copy construct
+        splineEdge(const splineEdge&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const splineEdge&);
+        //- No copy assignment
+        void operator=(const splineEdge&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blockFaces/projectFace/projectFace.H b/src/mesh/blockMesh/blockFaces/projectFace/projectFace.H
index 635318b05c..67e3e7d0b4 100644
--- a/src/mesh/blockMesh/blockFaces/projectFace/projectFace.H
+++ b/src/mesh/blockMesh/blockFaces/projectFace/projectFace.H
@@ -83,11 +83,11 @@ class projectFace
             scalarField& lambdaJ
         ) const;
 
-        //- Disallow default bitwise copy construct
-        projectFace(const projectFace&);
+        //- No copy construct
+        projectFace(const projectFace&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const projectFace&);
+        //- No copy assignment
+        void operator=(const projectFace&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.H b/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.H
index d47dce6e8c..a82d740909 100644
--- a/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.H
+++ b/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.H
@@ -63,11 +63,11 @@ class projectVertex
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        projectVertex(const projectVertex&);
+        //- No copy construct
+        projectVertex(const projectVertex&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const projectVertex&);
+        //- No copy assignment
+        void operator=(const projectVertex&) = delete;
 
 
 public:
diff --git a/src/mesh/blockMesh/blocks/block/block.H b/src/mesh/blockMesh/blocks/block/block.H
index 9f3e0f6e7e..c0150a9c3a 100644
--- a/src/mesh/blockMesh/blocks/block/block.H
+++ b/src/mesh/blockMesh/blocks/block/block.H
@@ -82,11 +82,11 @@ class block
         //- Creates boundary patch faces for the block
         void createBoundary();
 
-        //- Disallow default bitwise copy construct
-        block(const block&);
+        //- No copy construct
+        block(const block&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const block&);
+        //- No copy assignment
+        void operator=(const block&) = delete;
 
 
 public:
diff --git a/src/mesh/extrudeModel/extrudeModel/extrudeModel.H b/src/mesh/extrudeModel/extrudeModel/extrudeModel.H
index f107206cc0..0b2871b48a 100644
--- a/src/mesh/extrudeModel/extrudeModel/extrudeModel.H
+++ b/src/mesh/extrudeModel/extrudeModel/extrudeModel.H
@@ -66,11 +66,11 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        extrudeModel(const extrudeModel&);
+        //- No copy construct
+        extrudeModel(const extrudeModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const extrudeModel&);
+        //- No copy assignment
+        void operator=(const extrudeModel&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
index bac6d13233..9dc14cbe31 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
@@ -59,14 +59,14 @@ class displacementMeshMoverMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementMeshMoverMotionSolver
         (
             const displacementMeshMoverMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const displacementMeshMoverMotionSolver&);
+        //- No copy assignment
+        void operator=(const displacementMeshMoverMotionSolver&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
index 4e1cf14b23..f9d65ef825 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
@@ -84,14 +84,14 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         externalDisplacementMeshMover
         (
             const externalDisplacementMeshMover&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const externalDisplacementMeshMover&);
+        //- No copy assignment
+        void operator=(const externalDisplacementMeshMover&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmoother.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmoother.H
index d5b09e4969..1ed4ac7d16 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmoother.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmoother.H
@@ -56,11 +56,11 @@ class fieldSmoother
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fieldSmoother(const fieldSmoother&);
+        //- No copy construct
+        fieldSmoother(const fieldSmoother&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fieldSmoother&);
+        //- No copy assignment
+        void operator=(const fieldSmoother&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
index 4cfbca42c3..6fa9a02405 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
@@ -186,11 +186,11 @@ class medialAxisMeshMover
             labelList& checkFaces
         );
 
-        //- Disallow default bitwise copy construct
-        medialAxisMeshMover(const medialAxisMeshMover&);
+        //- No copy construct
+        medialAxisMeshMover(const medialAxisMeshMover&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const medialAxisMeshMover&);
+        //- No copy assignment
+        void operator=(const medialAxisMeshMover&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index 2ae2f5634c..0c12143384 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
@@ -785,11 +785,11 @@ private:
             ) const;
 
 
-        //- Disallow default bitwise copy construct
-        meshRefinement(const meshRefinement&);
+        //- No copy construct
+        meshRefinement(const meshRefinement&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const meshRefinement&);
+        //- No copy assignment
+        void operator=(const meshRefinement&) = delete;
 
 public:
 
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H
index 4a985dc951..d3939c763e 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H
@@ -111,11 +111,11 @@ class refinementSurfaces
             const labelList& surfaceLevel
         ) const;
 
-        //- Disallow default bitwise copy construct
-        refinementSurfaces(const refinementSurfaces&);
+        //- No copy construct
+        refinementSurfaces(const refinementSurfaces&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const refinementSurfaces&);
+        //- No copy assignment
+        void operator=(const refinementSurfaces&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
index 94ce042ab3..84c399f80c 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
@@ -106,8 +106,8 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const surfaceZonesInfo&);
+        //- No copy assignment
+        void operator=(const surfaceZonesInfo&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H
index 7f23280e5a..34a9e813ec 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H
@@ -143,11 +143,11 @@ private:
             const scalar totalOverFirst
         ) const;
 
-        //- Disallow default bitwise copy construct
-        layerParameters(const layerParameters&);
+        //- No copy construct
+        layerParameters(const layerParameters&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const layerParameters&);
+        //- No copy assignment
+        void operator=(const layerParameters&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H
index 6ac70dc47f..a6475c00d4 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H
@@ -111,11 +111,11 @@ class refinementParameters
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        refinementParameters(const refinementParameters&);
+        //- No copy construct
+        refinementParameters(const refinementParameters&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const refinementParameters&);
+        //- No copy assignment
+        void operator=(const refinementParameters&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.H
index a3d97a3d43..c81b889999 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.H
@@ -97,11 +97,11 @@ class snapParameters
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        snapParameters(const snapParameters&);
+        //- No copy construct
+        snapParameters(const snapParameters&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const snapParameters&);
+        //- No copy assignment
+        void operator=(const snapParameters&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
index 0dae6abac1..9c663cf70b 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
@@ -599,11 +599,11 @@ private:
 
 
 
-        //- Disallow default bitwise copy construct
-        snappyLayerDriver(const snappyLayerDriver&);
+        //- No copy construct
+        snappyLayerDriver(const snappyLayerDriver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const snappyLayerDriver&);
+        //- No copy assignment
+        void operator=(const snappyLayerDriver&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H
index 3ac28db62b..3e86f08b64 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H
@@ -185,11 +185,11 @@ class snappyRefineDriver
             const dictionary& motionDict
         );
 
-        //- Disallow default bitwise copy construct
-        snappyRefineDriver(const snappyRefineDriver&);
+        //- No copy construct
+        snappyRefineDriver(const snappyRefineDriver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const snappyRefineDriver&);
+        //- No copy assignment
+        void operator=(const snappyRefineDriver&) = delete;
 
 
 public:
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
index 7072ba0683..7d7f9c4056 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
@@ -650,11 +650,11 @@ class snappySnapDriver
                 ) const;
 
 
-        //- Disallow default bitwise copy construct
-        snappySnapDriver(const snappySnapDriver&);
+        //- No copy construct
+        snappySnapDriver(const snappySnapDriver&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const snappySnapDriver&);
+        //- No copy assignment
+        void operator=(const snappySnapDriver&) = delete;
 
 
 public:
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
index 7723262779..c47938ca84 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
@@ -170,11 +170,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        AMIInterpolation(const AMIInterpolation&);
+        //- No copy construct
+        AMIInterpolation(const AMIInterpolation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const AMIInterpolation&);
+        //- No copy assignment
+        void operator=(const AMIInterpolation&) = delete;
 
 
         // Parallel functionality
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
index 6e2a73c5b9..3261e37141 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
@@ -62,11 +62,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        AMIMethod(const AMIMethod&);
+        //- No copy construct
+        AMIMethod(const AMIMethod&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const AMIMethod&);
+        //- No copy assignment
+        void operator=(const AMIMethod&) = delete;
 
 
 protected:
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H
index 5a00283616..86c9667258 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H
@@ -56,11 +56,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        directAMI(const directAMI&);
+        //- No copy construct
+        directAMI(const directAMI&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const directAMI&);
+        //- No copy assignment
+        void operator=(const directAMI&) = delete;
 
         // Marching front
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
index e98d1f6093..7ab28ea61e 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
@@ -63,11 +63,11 @@ protected:
 
     // Protected Member Functions
 
-        //- Disallow default bitwise copy construct
-        faceAreaWeightAMI(const faceAreaWeightAMI&);
+        //- No copy construct
+        faceAreaWeightAMI(const faceAreaWeightAMI&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faceAreaWeightAMI&);
+        //- No copy assignment
+        void operator=(const faceAreaWeightAMI&) = delete;
 
         // Marching front
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H
index 372ee66dc4..9faa7ea599 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H
@@ -56,11 +56,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        mapNearestAMI(const mapNearestAMI&);
+        //- No copy construct
+        mapNearestAMI(const mapNearestAMI&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const mapNearestAMI&);
+        //- No copy assignment
+        void operator=(const mapNearestAMI&) = delete;
 
         // Marching front
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H
index 19f7f63bc3..89bef39e0b 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H
@@ -56,11 +56,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        partialFaceAreaWeightAMI(const partialFaceAreaWeightAMI&);
+        //- No copy construct
+        partialFaceAreaWeightAMI(const partialFaceAreaWeightAMI&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const partialFaceAreaWeightAMI&);
+        //- No copy assignment
+        void operator=(const partialFaceAreaWeightAMI&) = delete;
 
         // Marching front
 
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.H b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.H
index 76bc617134..9269751106 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.H
@@ -68,11 +68,14 @@ class cyclicACMIGAMGInterfaceField
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cyclicACMIGAMGInterfaceField(const cyclicACMIGAMGInterfaceField&);
+        //- No copy construct
+        cyclicACMIGAMGInterfaceField
+        (
+            const cyclicACMIGAMGInterfaceField&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cyclicACMIGAMGInterfaceField&);
+        //- No copy assignment
+        void operator=(const cyclicACMIGAMGInterfaceField&) = delete;
 
 
 public:
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H
index 73074fa189..b7de951756 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H
@@ -67,11 +67,14 @@ class cyclicAMIGAMGInterfaceField
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cyclicAMIGAMGInterfaceField(const cyclicAMIGAMGInterfaceField&);
+        //- No copy construct
+        cyclicAMIGAMGInterfaceField
+        (
+            const cyclicAMIGAMGInterfaceField&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cyclicAMIGAMGInterfaceField&);
+        //- No copy assignment
+        void operator=(const cyclicAMIGAMGInterfaceField&) = delete;
 
 
 public:
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H
index 821743a975..fbc11b9e7b 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H
@@ -64,11 +64,11 @@ class cyclicACMIGAMGInterface
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cyclicACMIGAMGInterface(const cyclicACMIGAMGInterface&);
+        //- No copy construct
+        cyclicACMIGAMGInterface(const cyclicACMIGAMGInterface&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cyclicACMIGAMGInterface&);
+        //- No copy assignment
+        void operator=(const cyclicACMIGAMGInterface&) = delete;
 
 
 public:
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
index 1e2d3241e2..c4bb15b4ac 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
@@ -64,11 +64,11 @@ class cyclicAMIGAMGInterface
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cyclicAMIGAMGInterface(const cyclicAMIGAMGInterface&);
+        //- No copy construct
+        cyclicAMIGAMGInterface(const cyclicAMIGAMGInterface&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cyclicAMIGAMGInterface&);
+        //- No copy assignment
+        void operator=(const cyclicAMIGAMGInterface&) = delete;
 
 
 public:
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatch/cyclicACMIPointPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatch/cyclicACMIPointPatch.H
index 9994fdf308..6d0612774a 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatch/cyclicACMIPointPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatch/cyclicACMIPointPatch.H
@@ -60,11 +60,11 @@ class cyclicACMIPointPatch
 
     // Private Member Functions
 
-        //- Disallow default construct as copy
-        cyclicACMIPointPatch(const cyclicACMIPointPatch&);
+        //- No copy construct
+        cyclicACMIPointPatch(const cyclicACMIPointPatch&) = delete;
 
-        //- Disallow default assignment
-        void operator=(const cyclicACMIPointPatch&);
+        //- No copy assignment
+        void operator=(const cyclicACMIPointPatch&) = delete;
 
 
 protected:
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.H
index eeb26ebe26..5a24a8e08c 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.H
@@ -60,11 +60,11 @@ class cyclicAMIPointPatch
 
     // Private Member Functions
 
-        //- Disallow default construct as copy
-        cyclicAMIPointPatch(const cyclicAMIPointPatch&);
+        //- No copy construct
+        cyclicAMIPointPatch(const cyclicAMIPointPatch&) = delete;
 
-        //- Disallow default assignment
-        void operator=(const cyclicAMIPointPatch&);
+        //- No copy assignment
+        void operator=(const cyclicAMIPointPatch&) = delete;
 
 
 protected:
diff --git a/src/meshTools/algorithms/MeshWave/MeshWave.H b/src/meshTools/algorithms/MeshWave/MeshWave.H
index f522a30bd0..05dbfd2a8a 100644
--- a/src/meshTools/algorithms/MeshWave/MeshWave.H
+++ b/src/meshTools/algorithms/MeshWave/MeshWave.H
@@ -71,11 +71,11 @@ class MeshWave
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        MeshWave(const MeshWave&);
+        //- No copy construct
+        MeshWave(const MeshWave&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const MeshWave&);
+        //- No copy assignment
+        void operator=(const MeshWave&) = delete;
 
       // Private static data
 
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
index 176aaded9d..9a62840037 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
@@ -151,11 +151,11 @@ class PatchEdgeFaceWave
         //- Update coupled edges
         void syncEdges();
 
-        //- Disallow default bitwise copy construct
-        PatchEdgeFaceWave(const PatchEdgeFaceWave&);
+        //- No copy construct
+        PatchEdgeFaceWave(const PatchEdgeFaceWave&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PatchEdgeFaceWave&);
+        //- No copy assignment
+        void operator=(const PatchEdgeFaceWave&) = delete;
 
 
 public:
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
index ad85976f01..94797a859b 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
@@ -210,11 +210,11 @@ class PointEdgeWave
             label handleCollocatedPoints();
 
 
-        //- Disallow default bitwise copy construct
-        PointEdgeWave(const PointEdgeWave&);
+        //- No copy construct
+        PointEdgeWave(const PointEdgeWave&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PointEdgeWave&);
+        //- No copy assignment
+        void operator=(const PointEdgeWave&) = delete;
 
 
 public:
diff --git a/src/meshTools/cellDist/cellDistFuncs.H b/src/meshTools/cellDist/cellDistFuncs.H
index e9ead169bb..15f360a2bf 100644
--- a/src/meshTools/cellDist/cellDistFuncs.H
+++ b/src/meshTools/cellDist/cellDistFuncs.H
@@ -73,11 +73,11 @@ class cellDistFuncs
         static label findIndex(const label n, const labelList&, const label);
 
 
-        //- Disallow default bitwise copy construct
-        cellDistFuncs(const cellDistFuncs&);
+        //- No copy construct
+        cellDistFuncs(const cellDistFuncs&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellDistFuncs&);
+        //- No copy assignment
+        void operator=(const cellDistFuncs&) = delete;
 
 public:
 
diff --git a/src/meshTools/cellFeatures/cellFeatures.H b/src/meshTools/cellFeatures/cellFeatures.H
index 3964c01202..f2627e7944 100644
--- a/src/meshTools/cellFeatures/cellFeatures.H
+++ b/src/meshTools/cellFeatures/cellFeatures.H
@@ -105,11 +105,11 @@ class cellFeatures
         void calcSuperFaces() const;
 
 
-        //- Disallow default bitwise copy construct
-        cellFeatures(const cellFeatures&);
+        //- No copy construct
+        cellFeatures(const cellFeatures&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellFeatures&);
+        //- No copy assignment
+        void operator=(const cellFeatures&) = delete;
 
 public:
 
diff --git a/src/meshTools/cellQuality/cellQuality.H b/src/meshTools/cellQuality/cellQuality.H
index 420efc7740..225db35666 100644
--- a/src/meshTools/cellQuality/cellQuality.H
+++ b/src/meshTools/cellQuality/cellQuality.H
@@ -57,11 +57,11 @@ class cellQuality
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellQuality(const cellQuality&);
+        //- No copy construct
+        cellQuality(const cellQuality&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellQuality&);
+        //- No copy assignment
+        void operator=(const cellQuality&) = delete;
 
 
 public:
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.H b/src/meshTools/coordinateSystems/coordinateSystems.H
index cd15f0f97f..1e429b97c2 100644
--- a/src/meshTools/coordinateSystems/coordinateSystems.H
+++ b/src/meshTools/coordinateSystems/coordinateSystems.H
@@ -76,10 +76,10 @@ class coordinateSystems
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         coordinateSystems(const coordinateSystems&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const coordinateSystems&) = delete;
 
 
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H
index 3a39a1d5f5..e5aeb71055 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H
@@ -59,11 +59,11 @@ class edgeMeshFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        edgeMeshFormat(const edgeMeshFormat&);
+        //- No copy construct
+        edgeMeshFormat(const edgeMeshFormat&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const edgeMeshFormat&);
+        //- No copy assignment
+        void operator=(const edgeMeshFormat&) = delete;
 
 
 protected:
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H
index 876140ff5e..9b9439ead3 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H
@@ -54,11 +54,14 @@ class extendedFeatureEdgeMeshFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        extendedFeatureEdgeMeshFormat(const extendedFeatureEdgeMeshFormat&);
+        //- No copy construct
+        extendedFeatureEdgeMeshFormat
+        (
+            const extendedFeatureEdgeMeshFormat&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const extendedFeatureEdgeMeshFormat&);
+        //- No copy assignment
+        void operator=(const extendedFeatureEdgeMeshFormat&) = delete;
 
 
 public:
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H
index d5cd410c9d..f7ff5a3b7a 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H
@@ -63,10 +63,10 @@ class NASedgeFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         NASedgeFormat(const NASedgeFormat&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const NASedgeFormat&) = delete;
 
 public:
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H
index 1b7ff59b9a..4a8cf3651b 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H
@@ -58,10 +58,10 @@ class OBJedgeFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         OBJedgeFormat(const OBJedgeFormat&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const OBJedgeFormat&) = delete;
 
 
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H
index 246028b1fa..ef825e4aec 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H
@@ -68,10 +68,10 @@ class STARCDedgeFormat
         static inline void writeLines(Ostream&, const edgeList&);
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         STARCDedgeFormat(const STARCDedgeFormat&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const STARCDedgeFormat&) = delete;
 
 
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H
index 3cbe13b812..7304c5e910 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H
@@ -54,11 +54,11 @@ class VTKedgeFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        VTKedgeFormat(const VTKedgeFormat&);
+        //- No copy construct
+        VTKedgeFormat(const VTKedgeFormat&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const VTKedgeFormat&);
+        //- No copy assignment
+        void operator=(const VTKedgeFormat&) = delete;
 
 
 protected:
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.H
index 8c3e2d95bc..6329d34450 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.H
@@ -55,11 +55,11 @@ class extendedEdgeMeshFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        extendedEdgeMeshFormat(const extendedEdgeMeshFormat&);
+        //- No copy construct
+        extendedEdgeMeshFormat(const extendedEdgeMeshFormat&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const extendedEdgeMeshFormat&);
+        //- No copy assignment
+        void operator=(const extendedEdgeMeshFormat&) = delete;
 
 
 public:
diff --git a/src/meshTools/meshSearch/meshSearch.H b/src/meshTools/meshSearch/meshSearch.H
index fca4846009..7ac1bca5cc 100644
--- a/src/meshTools/meshSearch/meshSearch.H
+++ b/src/meshTools/meshSearch/meshSearch.H
@@ -145,11 +145,11 @@ class meshSearch
             ) const;
 
 
-        //- Disallow default bitwise copy construct
-        meshSearch(const meshSearch&);
+        //- No copy construct
+        meshSearch(const meshSearch&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const meshSearch&);
+        //- No copy assignment
+        void operator=(const meshSearch&) = delete;
 
 
 public:
diff --git a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.H b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.H
index 6701e2b7bc..270f1ad81a 100644
--- a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.H
+++ b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.H
@@ -60,14 +60,14 @@ class regionCoupledGAMGInterfaceField
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         regionCoupledGAMGInterfaceField
         (
             const regionCoupledGAMGInterfaceField&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const regionCoupledGAMGInterfaceField&);
+        //- No copy assignment
+        void operator=(const regionCoupledGAMGInterfaceField&) = delete;
 
 
 public:
diff --git a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.H b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.H
index ca8c0b9b68..194093736a 100644
--- a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.H
+++ b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.H
@@ -60,14 +60,14 @@ class regionCoupledWallGAMGInterfaceField
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         regionCoupledWallGAMGInterfaceField
         (
             const regionCoupledWallGAMGInterfaceField&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const regionCoupledWallGAMGInterfaceField&);
+        //- No copy assignment
+        void operator=(const regionCoupledWallGAMGInterfaceField&) = delete;
 
 
 public:
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.H b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.H
index 7fb7206cb1..797cd73bdb 100644
--- a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.H
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.H
@@ -65,11 +65,14 @@ class regionCoupledBaseGAMGInterface
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        regionCoupledBaseGAMGInterface(const regionCoupledBaseGAMGInterface&);
+        //- No copy construct
+        regionCoupledBaseGAMGInterface
+        (
+            const regionCoupledBaseGAMGInterface&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const regionCoupledBaseGAMGInterface&);
+        //- No copy assignment
+        void operator=(const regionCoupledBaseGAMGInterface&) = delete;
 
 
 public:
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.H b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.H
index 88fb90db28..0ab13240bf 100644
--- a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.H
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.H
@@ -53,11 +53,11 @@ class regionCoupledGAMGInterface
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        regionCoupledGAMGInterface(const regionCoupledGAMGInterface&);
+        //- No copy construct
+        regionCoupledGAMGInterface(const regionCoupledGAMGInterface&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const regionCoupledGAMGInterface&);
+        //- No copy assignment
+        void operator=(const regionCoupledGAMGInterface&) = delete;
 
 
 public:
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.H b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.H
index fe283c6152..cef3a1ed07 100644
--- a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.H
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.H
@@ -54,11 +54,14 @@ class regionCoupledWallGAMGInterface
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        regionCoupledWallGAMGInterface(const regionCoupledWallGAMGInterface&);
+        //- No copy construct
+        regionCoupledWallGAMGInterface
+        (
+            const regionCoupledWallGAMGInterface&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const regionCoupledWallGAMGInterface&);
+        //- No copy assignment
+        void operator=(const regionCoupledWallGAMGInterface&) = delete;
 
 
 public:
diff --git a/src/meshTools/regionSplit2D/regionSplit2D.H b/src/meshTools/regionSplit2D/regionSplit2D.H
index 651e428923..60129f8260 100644
--- a/src/meshTools/regionSplit2D/regionSplit2D.H
+++ b/src/meshTools/regionSplit2D/regionSplit2D.H
@@ -67,11 +67,11 @@ class regionSplit2D
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        regionSplit2D(const regionSplit2D&);
+        //- No copy construct
+        regionSplit2D(const regionSplit2D&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const regionSplit2D&);
+        //- No copy assignment
+        void operator=(const regionSplit2D&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/closedTriSurfaceMesh/closedTriSurfaceMesh.H b/src/meshTools/searchableSurfaces/closedTriSurfaceMesh/closedTriSurfaceMesh.H
index 8212f906c4..3d53f3e4b6 100644
--- a/src/meshTools/searchableSurfaces/closedTriSurfaceMesh/closedTriSurfaceMesh.H
+++ b/src/meshTools/searchableSurfaces/closedTriSurfaceMesh/closedTriSurfaceMesh.H
@@ -54,11 +54,11 @@ class closedTriSurfaceMesh
 {
 private:
 
-        //- Disallow default bitwise copy construct
-        closedTriSurfaceMesh(const closedTriSurfaceMesh&);
+        //- No copy construct
+        closedTriSurfaceMesh(const closedTriSurfaceMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const closedTriSurfaceMesh&);
+        //- No copy assignment
+        void operator=(const closedTriSurfaceMesh&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchableBox/searchableBox.H b/src/meshTools/searchableSurfaces/searchableBox/searchableBox.H
index 9162e253c5..be85f6bf7d 100644
--- a/src/meshTools/searchableSurfaces/searchableBox/searchableBox.H
+++ b/src/meshTools/searchableSurfaces/searchableBox/searchableBox.H
@@ -83,11 +83,11 @@ private:
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        searchableBox(const searchableBox&);
+        //- No copy construct
+        searchableBox(const searchableBox&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableBox&);
+        //- No copy assignment
+        void operator=(const searchableBox&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchableCone/searchableCone.H b/src/meshTools/searchableSurfaces/searchableCone/searchableCone.H
index 81636f5975..25ad87f5c0 100644
--- a/src/meshTools/searchableSurfaces/searchableCone/searchableCone.H
+++ b/src/meshTools/searchableSurfaces/searchableCone/searchableCone.H
@@ -135,11 +135,11 @@ class searchableCone
         //- Return the boundBox of the cylinder
         boundBox calcBounds() const;
 
-        //- Disallow default bitwise copy construct
-        searchableCone(const searchableCone&);
+        //- No copy construct
+        searchableCone(const searchableCone&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableCone&);
+        //- No copy assignment
+        void operator=(const searchableCone&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchableCylinder/searchableCylinder.H b/src/meshTools/searchableSurfaces/searchableCylinder/searchableCylinder.H
index df46a18c48..9c44b8bb78 100644
--- a/src/meshTools/searchableSurfaces/searchableCylinder/searchableCylinder.H
+++ b/src/meshTools/searchableSurfaces/searchableCylinder/searchableCylinder.H
@@ -100,11 +100,11 @@ private:
         //- Return the boundBox of the cylinder
         boundBox calcBounds() const;
 
-        //- Disallow default bitwise copy construct
-        searchableCylinder(const searchableCylinder&);
+        //- No copy construct
+        searchableCylinder(const searchableCylinder&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableCylinder&);
+        //- No copy assignment
+        void operator=(const searchableCylinder&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.H b/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.H
index 5cebb1cede..1f66f47fa9 100644
--- a/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.H
+++ b/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.H
@@ -89,11 +89,11 @@ private:
             pointIndexHit&
         ) const;
 
-        //- Disallow default bitwise copy construct
-        searchableDisk(const searchableDisk&);
+        //- No copy construct
+        searchableDisk(const searchableDisk&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableDisk&);
+        //- No copy assignment
+        void operator=(const searchableDisk&) = delete;
 
 public:
 
diff --git a/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.H b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.H
index 83f537ab65..83ac445ed4 100644
--- a/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.H
+++ b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.H
@@ -73,11 +73,11 @@ class searchableExtrudedCircle
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        searchableExtrudedCircle(const searchableExtrudedCircle&);
+        //- No copy construct
+        searchableExtrudedCircle(const searchableExtrudedCircle&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableExtrudedCircle&);
+        //- No copy assignment
+        void operator=(const searchableExtrudedCircle&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchablePlane/searchablePlane.H b/src/meshTools/searchableSurfaces/searchablePlane/searchablePlane.H
index 0e782a0198..66e63c4de9 100644
--- a/src/meshTools/searchableSurfaces/searchablePlane/searchablePlane.H
+++ b/src/meshTools/searchableSurfaces/searchablePlane/searchablePlane.H
@@ -72,11 +72,11 @@ private:
         //- Return the boundBox of the plane
         boundBox calcBounds() const;
 
-        //- Disallow default bitwise copy construct
-        searchablePlane(const searchablePlane&);
+        //- No copy construct
+        searchablePlane(const searchablePlane&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchablePlane&);
+        //- No copy assignment
+        void operator=(const searchablePlane&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.H b/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.H
index 944179e0cb..6d85baeb74 100644
--- a/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.H
+++ b/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.H
@@ -95,11 +95,11 @@ private:
             const point& end
         ) const;
 
-        //- Disallow default bitwise copy construct
-        searchablePlate(const searchablePlate&);
+        //- No copy construct
+        searchablePlate(const searchablePlate&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchablePlate&);
+        //- No copy assignment
+        void operator=(const searchablePlate&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.H b/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.H
index cca6444c06..9ac77123ba 100644
--- a/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.H
+++ b/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.H
@@ -80,11 +80,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        searchableRotatedBox(const searchableRotatedBox&);
+        //- No copy construct
+        searchableRotatedBox(const searchableRotatedBox&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableRotatedBox&);
+        //- No copy assignment
+        void operator=(const searchableRotatedBox&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.H b/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.H
index 1346df359b..214343ea58 100644
--- a/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.H
+++ b/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.H
@@ -89,11 +89,11 @@ private:
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        searchableSphere(const searchableSphere&);
+        //- No copy construct
+        searchableSphere(const searchableSphere&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableSphere&);
+        //- No copy assignment
+        void operator=(const searchableSphere&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H
index 38f9d0226b..2a5579f221 100644
--- a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H
+++ b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H
@@ -77,11 +77,11 @@ class searchableSurface
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        searchableSurface(const searchableSurface&);
+        //- No copy construct
+        searchableSurface(const searchableSurface&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableSurface&);
+        //- No copy assignment
+        void operator=(const searchableSurface&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.H b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.H
index 7945638907..222c1477e1 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.H
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.H
@@ -108,11 +108,14 @@ class searchableSurfaceCollection
         ) const;
 
 
-        //- Disallow default bitwise copy construct
-        searchableSurfaceCollection(const searchableSurfaceCollection&);
+        //- No copy construct
+        searchableSurfaceCollection
+        (
+            const searchableSurfaceCollection&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableSurfaceCollection&);
+        //- No copy assignment
+        void operator=(const searchableSurfaceCollection&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.H b/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.H
index 8faf330878..fd0ad48be2 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.H
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.H
@@ -114,11 +114,11 @@ private:
         );
 
 
-        //- Disallow default bitwise copy construct
-        searchableSurfaceWithGaps(const searchableSurfaceWithGaps&);
+        //- No copy construct
+        searchableSurfaceWithGaps(const searchableSurfaceWithGaps&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableSurfaceWithGaps&);
+        //- No copy assignment
+        void operator=(const searchableSurfaceWithGaps&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H
index 26fe024b59..bcec55ed07 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H
+++ b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H
@@ -78,11 +78,11 @@ class searchableSurfaces
         );
 
 
-        //- Disallow default bitwise copy construct
-        searchableSurfaces(const searchableSurfaces&);
+        //- No copy construct
+        searchableSurfaces(const searchableSurfaces&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const searchableSurfaces&);
+        //- No copy assignment
+        void operator=(const searchableSurfaces&) = delete;
 
 
 public:
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
index 54af373a33..7d5d2fcb2a 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
@@ -134,11 +134,11 @@ class triSurfaceMesh
             DynamicList<pointIndexHit>& hits
         );
 
-        //- Disallow default bitwise copy construct
-        triSurfaceMesh(const triSurfaceMesh&);
+        //- No copy construct
+        triSurfaceMesh(const triSurfaceMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const triSurfaceMesh&);
+        //- No copy assignment
+        void operator=(const triSurfaceMesh&) = delete;
 
 
 public:
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.H b/src/meshTools/sets/topoSetSource/topoSetSource.H
index 5ec7041411..46042fe349 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.H
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.H
@@ -139,10 +139,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         topoSetSource(const topoSetSource&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const topoSetSource&) = delete;
 
 
diff --git a/src/meshTools/sets/topoSets/cellSet.H b/src/meshTools/sets/topoSets/cellSet.H
index adb7f8edb1..7d47e9ec01 100644
--- a/src/meshTools/sets/topoSets/cellSet.H
+++ b/src/meshTools/sets/topoSets/cellSet.H
@@ -52,7 +52,7 @@ class cellSet
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         cellSet(const cellSet&) = delete;
 
 
diff --git a/src/meshTools/sets/topoSets/topoSet.H b/src/meshTools/sets/topoSets/topoSet.H
index 0349894298..82ca3e42ee 100644
--- a/src/meshTools/sets/topoSets/topoSet.H
+++ b/src/meshTools/sets/topoSets/topoSet.H
@@ -106,7 +106,7 @@ protected:
         ) const;
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         topoSet(const topoSet&) = delete;
 
 
diff --git a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.H b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.H
index 9d2a827ea1..91950fee2f 100644
--- a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.H
+++ b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.H
@@ -91,10 +91,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         triSurfaceLoader(const triSurfaceLoader&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const triSurfaceLoader&) = delete;
 
 public:
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.H b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.H
index 1390bfa98f..3d42679c2a 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.H
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.H
@@ -83,11 +83,11 @@ class triSurfaceRegionSearch
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        triSurfaceRegionSearch(const triSurfaceRegionSearch&);
+        //- No copy construct
+        triSurfaceRegionSearch(const triSurfaceRegionSearch&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const triSurfaceRegionSearch&);
+        //- No copy assignment
+        void operator=(const triSurfaceRegionSearch&) = delete;
 
 
 public:
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H
index d42806a563..8f12c58897 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H
@@ -84,10 +84,10 @@ class triSurfaceSearch
             const vector& lineVec
         ) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         triSurfaceSearch(const triSurfaceSearch&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const triSurfaceSearch&) = delete;
 
 
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H b/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
index 83d5483ee0..faa1e61d33 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
@@ -86,11 +86,11 @@ class twoDPointCorrector
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        twoDPointCorrector(const twoDPointCorrector&);
+        //- No copy construct
+        twoDPointCorrector(const twoDPointCorrector&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const twoDPointCorrector&);
+        //- No copy assignment
+        void operator=(const twoDPointCorrector&) = delete;
 
 
         //- Calculate addressing
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
index 05a3d7cf59..af415228b8 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
@@ -96,11 +96,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellCellStencil(const cellCellStencil&);
+        //- No copy construct
+        cellCellStencil(const cellCellStencil&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellCellStencil&);
+        //- No copy assignment
+        void operator=(const cellCellStencil&) = delete;
 
 
 public:
diff --git a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H
index 6c1a8003be..321922a8a9 100644
--- a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H
+++ b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H
@@ -156,11 +156,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        cellVolumeWeight(const cellVolumeWeight&);
+        //- No copy construct
+        cellVolumeWeight(const cellVolumeWeight&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellVolumeWeight&);
+        //- No copy assignment
+        void operator=(const cellVolumeWeight&) = delete;
 
 
 public:
diff --git a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H
index 9b140b4ce6..8d9b6cbb6f 100644
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H
@@ -250,11 +250,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        inverseDistance(const inverseDistance&);
+        //- No copy construct
+        inverseDistance(const inverseDistance&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const inverseDistance&);
+        //- No copy assignment
+        void operator=(const inverseDistance&) = delete;
 
 
 public:
diff --git a/src/overset/cellCellStencil/inverseDistance/waveMethod.H b/src/overset/cellCellStencil/inverseDistance/waveMethod.H
index 9ab9635bcf..e26a920a6a 100644
--- a/src/overset/cellCellStencil/inverseDistance/waveMethod.H
+++ b/src/overset/cellCellStencil/inverseDistance/waveMethod.H
@@ -52,11 +52,11 @@ class waveMethod
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        waveMethod(const waveMethod&);
+        //- No copy construct
+        waveMethod(const waveMethod&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const waveMethod&);
+        //- No copy assignment
+        void operator=(const waveMethod&) = delete;
 
 
 public:
diff --git a/src/overset/cellCellStencil/leastSquares/leastSquaresCellCellStencil.H b/src/overset/cellCellStencil/leastSquares/leastSquaresCellCellStencil.H
index 4d9b88eb0f..e206b2236b 100644
--- a/src/overset/cellCellStencil/leastSquares/leastSquaresCellCellStencil.H
+++ b/src/overset/cellCellStencil/leastSquares/leastSquaresCellCellStencil.H
@@ -60,11 +60,11 @@ class leastSquares
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        leastSquares(const leastSquares&);
+        //- No copy construct
+        leastSquares(const leastSquares&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const leastSquares&);
+        //- No copy assignment
+        void operator=(const leastSquares&) = delete;
 
 
 public:
diff --git a/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.H b/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.H
index bcc49000c4..d5951c2e22 100644
--- a/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.H
+++ b/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.H
@@ -120,11 +120,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        trackingInverseDistance(const trackingInverseDistance&);
+        //- No copy construct
+        trackingInverseDistance(const trackingInverseDistance&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const trackingInverseDistance&);
+        //- No copy assignment
+        void operator=(const trackingInverseDistance&) = delete;
 
 
 public:
diff --git a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.H b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.H
index 3f8d9782f4..e040617884 100644
--- a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.H
+++ b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.H
@@ -127,11 +127,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        dynamicOversetFvMesh(const dynamicOversetFvMesh&);
+        //- No copy construct
+        dynamicOversetFvMesh(const dynamicOversetFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dynamicOversetFvMesh&);
+        //- No copy assignment
+        void operator=(const dynamicOversetFvMesh&) = delete;
 
 
 public:
diff --git a/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.H b/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.H
index 19662b761f..0988d2dd59 100644
--- a/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.H
+++ b/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.H
@@ -74,11 +74,14 @@ class fvMeshPrimitiveLduAddressing
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fvMeshPrimitiveLduAddressing(const fvMeshPrimitiveLduAddressing&);
+        //- No copy construct
+        fvMeshPrimitiveLduAddressing
+        (
+            const fvMeshPrimitiveLduAddressing&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvMeshPrimitiveLduAddressing&);
+        //- No copy assignment
+        void operator=(const fvMeshPrimitiveLduAddressing&) = delete;
 
 
 public:
diff --git a/src/overset/lduPrimitiveProcessorInterface/lduPrimitiveProcessorInterface.H b/src/overset/lduPrimitiveProcessorInterface/lduPrimitiveProcessorInterface.H
index 7f1f5d1dff..bba5075cad 100644
--- a/src/overset/lduPrimitiveProcessorInterface/lduPrimitiveProcessorInterface.H
+++ b/src/overset/lduPrimitiveProcessorInterface/lduPrimitiveProcessorInterface.H
@@ -75,11 +75,14 @@ class lduPrimitiveProcessorInterface
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        lduPrimitiveProcessorInterface(const lduPrimitiveProcessorInterface&);
+        //- No copy construct
+        lduPrimitiveProcessorInterface
+        (
+            const lduPrimitiveProcessorInterface&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const lduPrimitiveProcessorInterface&);
+        //- No copy assignment
+        void operator=(const lduPrimitiveProcessorInterface&) = delete;
 
 
 public:
diff --git a/src/overset/oversetPolyPatch/oversetGAMGInterface.H b/src/overset/oversetPolyPatch/oversetGAMGInterface.H
index 477368a2e6..c8ddf07cb4 100644
--- a/src/overset/oversetPolyPatch/oversetGAMGInterface.H
+++ b/src/overset/oversetPolyPatch/oversetGAMGInterface.H
@@ -78,11 +78,11 @@ class oversetGAMGInterface
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        oversetGAMGInterface(const oversetGAMGInterface&);
+        //- No copy construct
+        oversetGAMGInterface(const oversetGAMGInterface&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const oversetGAMGInterface&);
+        //- No copy assignment
+        void operator=(const oversetGAMGInterface&) = delete;
 
 
 public:
diff --git a/src/overset/oversetPolyPatch/oversetGAMGInterfaceField.H b/src/overset/oversetPolyPatch/oversetGAMGInterfaceField.H
index e706be9c14..146ae73948 100644
--- a/src/overset/oversetPolyPatch/oversetGAMGInterfaceField.H
+++ b/src/overset/oversetPolyPatch/oversetGAMGInterfaceField.H
@@ -64,11 +64,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        oversetGAMGInterfaceField(const oversetGAMGInterfaceField&);
+        //- No copy construct
+        oversetGAMGInterfaceField(const oversetGAMGInterfaceField&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const oversetGAMGInterfaceField&);
+        //- No copy assignment
+        void operator=(const oversetGAMGInterfaceField&) = delete;
 
 
 public:
diff --git a/src/overset/oversetPolyPatch/semiImplicitOversetGAMGInterfaceField.H b/src/overset/oversetPolyPatch/semiImplicitOversetGAMGInterfaceField.H
index c80bb38457..ea24871b65 100644
--- a/src/overset/oversetPolyPatch/semiImplicitOversetGAMGInterfaceField.H
+++ b/src/overset/oversetPolyPatch/semiImplicitOversetGAMGInterfaceField.H
@@ -52,14 +52,14 @@ class semiImplicitOversetGAMGInterfaceField
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         semiImplicitOversetGAMGInterfaceField
         (
             const semiImplicitOversetGAMGInterfaceField&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const semiImplicitOversetGAMGInterfaceField&);
+        //- No copy assignment
+        void operator=(const semiImplicitOversetGAMGInterfaceField&) = delete;
 
 
 public:
diff --git a/src/parallel/decompose/decompose/decompositionInformation.H b/src/parallel/decompose/decompose/decompositionInformation.H
index c0f24bb2cf..63ef7eeede 100644
--- a/src/parallel/decompose/decompose/decompositionInformation.H
+++ b/src/parallel/decompose/decompose/decompositionInformation.H
@@ -88,8 +88,10 @@ class decompositionInformation
             const label nDomains
         );
 
-        //- Disallow default bitwise copy construct and assignment
+        //- No copy construct
         decompositionInformation(const decompositionInformation&) = delete;
+
+        //- No copy assignment
         void operator=(const decompositionInformation&) = delete;
 
 
diff --git a/src/parallel/decompose/decompose/fvFieldDecomposer.H b/src/parallel/decompose/decompose/fvFieldDecomposer.H
index b4193edc97..4798a8c890 100644
--- a/src/parallel/decompose/decompose/fvFieldDecomposer.H
+++ b/src/parallel/decompose/decompose/fvFieldDecomposer.H
@@ -229,11 +229,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fvFieldDecomposer(const fvFieldDecomposer&);
+        //- No copy construct
+        fvFieldDecomposer(const fvFieldDecomposer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvFieldDecomposer&);
+        //- No copy assignment
+        void operator=(const fvFieldDecomposer&) = delete;
 
 
 public:
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
index 8f91f9612d..178169fd13 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
@@ -292,11 +292,11 @@ private:
             void distributeFields(const mapDistribute& map);
 
 
-        //- Disallow default bitwise copy construct
-        distributedTriSurfaceMesh(const distributedTriSurfaceMesh&);
+        //- No copy construct
+        distributedTriSurfaceMesh(const distributedTriSurfaceMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const distributedTriSurfaceMesh&);
+        //- No copy assignment
+        void operator=(const distributedTriSurfaceMesh&) = delete;
 
 
 public:
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
index b2454dc100..ee4c4236d1 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
@@ -77,11 +77,11 @@ class fvFieldReconstructor
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        fvFieldReconstructor(const fvFieldReconstructor&);
+        //- No copy construct
+        fvFieldReconstructor(const fvFieldReconstructor&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvFieldReconstructor&);
+        //- No copy assignment
+        void operator=(const fvFieldReconstructor&) = delete;
 
 
 public:
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
index 03ba97dc51..1181cc7812 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
@@ -74,11 +74,11 @@ class pointFieldReconstructor
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pointFieldReconstructor(const pointFieldReconstructor&);
+        //- No copy construct
+        pointFieldReconstructor(const pointFieldReconstructor&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pointFieldReconstructor&);
+        //- No copy assignment
+        void operator=(const pointFieldReconstructor&) = delete;
 
 
 public:
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.H b/src/parallel/reconstruct/reconstruct/processorMeshes.H
index 4f33212656..b900728daf 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.H
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.H
@@ -80,11 +80,11 @@ class processorMeshes
         //- Read all meshes
         void read();
 
-        //- Disallow default bitwise copy construct
-        processorMeshes(const processorMeshes&);
+        //- No copy construct
+        processorMeshes(const processorMeshes&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const processorMeshes&);
+        //- No copy assignment
+        void operator=(const processorMeshes&) = delete;
 
 
 public:
diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H
index 336f46ca86..02e403cf18 100644
--- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H
+++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H
@@ -97,11 +97,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        noiseModel(const noiseModel&);
+        //- No copy construct
+        noiseModel(const noiseModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const noiseModel&);
+        //- No copy assignment
+        void operator=(const noiseModel&) = delete;
 
 
 protected:
diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H
index 67cec6fdc0..86c5164b74 100644
--- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H
+++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H
@@ -61,11 +61,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        noPyrolysis(const noPyrolysis&);
+        //- No copy construct
+        noPyrolysis(const noPyrolysis&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const noPyrolysis&);
+        //- No copy assignment
+        void operator=(const noPyrolysis&) = delete;
 
 
 protected:
diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
index 79af2752cd..5c7b0672fa 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
@@ -72,11 +72,11 @@ private:
         //- Read pyrolysis controls
         void readPyrolysisControls();
 
-        //- Disallow default bitwise copy construct
-        pyrolysisModel(const pyrolysisModel&);
+        //- No copy construct
+        pyrolysisModel(const pyrolysisModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pyrolysisModel&);
+        //- No copy assignment
+        void operator=(const pyrolysisModel&) = delete;
 
 
 protected:
diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.H b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.H
index c91e727bf4..e8518629b5 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.H
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.H
@@ -64,11 +64,11 @@ class pyrolysisModelCollection
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        pyrolysisModelCollection(const pyrolysisModelCollection&);
+        //- No copy construct
+        pyrolysisModelCollection(const pyrolysisModelCollection&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const pyrolysisModelCollection&);
+        //- No copy assignment
+        void operator=(const pyrolysisModelCollection&) = delete;
 
 
 public:
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
index 09feafa320..19f1f3d95d 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
@@ -63,11 +63,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        reactingOneDim(const reactingOneDim&);
+        //- No copy construct
+        reactingOneDim(const reactingOneDim&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const reactingOneDim&);
+        //- No copy assignment
+        void operator=(const reactingOneDim&) = delete;
 
         //- Read model controls
         void readReactingOneDimControls();
diff --git a/src/regionModels/pyrolysisModels/thermo/thermo.H b/src/regionModels/pyrolysisModels/thermo/thermo.H
index ef06fc4dd2..45f182feb5 100644
--- a/src/regionModels/pyrolysisModels/thermo/thermo.H
+++ b/src/regionModels/pyrolysisModels/thermo/thermo.H
@@ -62,11 +62,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        thermo(const thermo&);
+        //- No copy construct
+        thermo(const thermo&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const thermo&);
+        //- No copy assignment
+        void operator=(const thermo&) = delete;
 
 
 protected:
diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H
index 3c30cb0f1c..0285d024da 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.H
+++ b/src/regionModels/regionModel/regionModel/regionModel.H
@@ -64,11 +64,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        regionModel(const regionModel&);
+        //- No copy construct
+        regionModel(const regionModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const regionModel&);
+        //- No copy assignment
+        void operator=(const regionModel&) = delete;
 
         //- Construct region mesh and fields
         void constructMeshObjects();
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.H b/src/regionModels/regionModel/regionModel1D/regionModel1D.H
index 84a8e2cba7..2b45798f38 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1D.H
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.H
@@ -56,11 +56,11 @@ class regionModel1D
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        regionModel1D(const regionModel1D&);
+        //- No copy construct
+        regionModel1D(const regionModel1D&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const regionModel1D&);
+        //- No copy assignment
+        void operator=(const regionModel1D&) = delete;
 
         //- Construct region mesh and fields
         void constructMeshObjects();
diff --git a/src/regionModels/regionModel/regionProperties/regionProperties.H b/src/regionModels/regionModel/regionProperties/regionProperties.H
index 54e703344c..579a8a0e1f 100644
--- a/src/regionModels/regionModel/regionProperties/regionProperties.H
+++ b/src/regionModels/regionModel/regionProperties/regionProperties.H
@@ -56,10 +56,10 @@ class regionProperties
     public HashTable<wordList>
 {
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         regionProperties(const regionProperties&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const regionProperties&) = delete;
 
 public:
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H
index 4dbb1eda97..fe344d6964 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H
@@ -54,11 +54,11 @@ class singleLayerRegion
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        singleLayerRegion(const singleLayerRegion&);
+        //- No copy construct
+        singleLayerRegion(const singleLayerRegion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const singleLayerRegion&);
+        //- No copy assignment
+        void operator=(const singleLayerRegion&) = delete;
 
         //- Construct region mesh and fields
         void constructMeshObjects();
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
index d839fe7da0..61abe43a2b 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
@@ -70,11 +70,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        kinematicSingleLayer(const kinematicSingleLayer&);
+        //- No copy construct
+        kinematicSingleLayer(const kinematicSingleLayer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const kinematicSingleLayer&);
+        //- No copy assignment
+        void operator=(const kinematicSingleLayer&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
index ce1fd77b69..19f4502092 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
@@ -63,11 +63,11 @@ class noFilm
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        noFilm(const noFilm&);
+        //- No copy construct
+        noFilm(const noFilm&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const noFilm&);
+        //- No copy assignment
+        void operator=(const noFilm&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H
index 0156fc1fd9..f7ac7a13cd 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H
@@ -122,11 +122,11 @@ private:
         //- Initialise thermoData object
         void init(thermoData& td);
 
-        //- Disallow default bitwise copy construct
-        constantFilmThermo(const constantFilmThermo&);
+        //- No copy construct
+        constantFilmThermo(const constantFilmThermo&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const constantFilmThermo&);
+        //- No copy assignment
+        void operator=(const constantFilmThermo&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H
index b54af005a3..59c6a256a4 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H
@@ -60,11 +60,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        filmThermoModel(const filmThermoModel&);
+        //- No copy construct
+        filmThermoModel(const filmThermoModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const filmThermoModel&);
+        //- No copy assignment
+        void operator=(const filmThermoModel&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H
index 336d35843d..a5d4c0d638 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H
@@ -89,11 +89,11 @@ protected:
         //- Initialise the liquid pointer
         void initLiquid(const dictionary& dict);
 
-        //- Disallow default bitwise copy construct
-        liquidFilmThermo(const liquidFilmThermo&);
+        //- No copy construct
+        liquidFilmThermo(const liquidFilmThermo&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const liquidFilmThermo&);
+        //- No copy assignment
+        void operator=(const liquidFilmThermo&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H
index 0b56b56ef6..14bbe00a6e 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H
@@ -62,11 +62,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        filmTurbulenceModel(const filmTurbulenceModel&);
+        //- No copy construct
+        filmTurbulenceModel(const filmTurbulenceModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const filmTurbulenceModel&);
+        //- No copy assignment
+        void operator=(const filmTurbulenceModel&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H
index 315922c591..491ea2b965 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H
@@ -64,11 +64,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        laminar(const laminar&);
+        //- No copy construct
+        laminar(const laminar&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const laminar&);
+        //- No copy assignment
+        void operator=(const laminar&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.H
index 3637959658..44a7246cb3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.H
@@ -71,11 +71,11 @@ class contactAngleForce
         //- Initialise
         void initialise();
 
-        //- Disallow default bitwise copy construct
-        contactAngleForce(const contactAngleForce&);
+        //- No copy construct
+        contactAngleForce(const contactAngleForce&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const contactAngleForce&);
+        //- No copy assignment
+        void operator=(const contactAngleForce&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H
index 8e98ae99dc..c93f9ff634 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H
@@ -71,11 +71,14 @@ class distributionContactAngleForce
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        distributionContactAngleForce(const distributionContactAngleForce&);
+        //- No copy construct
+        distributionContactAngleForce
+        (
+            const distributionContactAngleForce&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const distributionContactAngleForce&);
+        //- No copy assignment
+        void operator=(const distributionContactAngleForce&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H
index 63924ff5da..91df378170 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H
@@ -84,14 +84,17 @@ class perturbedTemperatureDependentContactAngleForce
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         perturbedTemperatureDependentContactAngleForce
         (
             const perturbedTemperatureDependentContactAngleForce&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const perturbedTemperatureDependentContactAngleForce&);
+        //- No copy assignment
+        void operator=
+        (
+            const perturbedTemperatureDependentContactAngleForce&
+        ) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H
index ce4abb57ca..716c3ed630 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H
@@ -70,14 +70,14 @@ class temperatureDependentContactAngleForce
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         temperatureDependentContactAngleForce
         (
             const temperatureDependentContactAngleForce&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const temperatureDependentContactAngleForce&);
+        //- No copy assignment
+        void operator=(const temperatureDependentContactAngleForce&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H
index 545f41ed5c..3db7fb7d2f 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H
@@ -61,11 +61,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        force(const force&);
+        //- No copy construct
+        force(const force&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const force&);
+        //- No copy assignment
+        void operator=(const force&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H
index 50ab680527..15368062a5 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H
@@ -58,11 +58,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        thermocapillaryForce(const thermocapillaryForce&);
+        //- No copy construct
+        thermocapillaryForce(const thermocapillaryForce&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const thermocapillaryForce&);
+        //- No copy assignment
+        void operator=(const thermocapillaryForce&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.H
index e875b98dd0..e896668207 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.H
@@ -78,11 +78,11 @@ class BrunDrippingInjection
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        BrunDrippingInjection(const BrunDrippingInjection&);
+        //- No copy construct
+        BrunDrippingInjection(const BrunDrippingInjection&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const BrunDrippingInjection&);
+        //- No copy assignment
+        void operator=(const BrunDrippingInjection&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
index cdbca326b9..2301bf1e03 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
@@ -72,11 +72,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        curvatureSeparation(const curvatureSeparation&);
+        //- No copy construct
+        curvatureSeparation(const curvatureSeparation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const curvatureSeparation&);
+        //- No copy assignment
+        void operator=(const curvatureSeparation&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
index 8e311e417c..fadc749272 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
@@ -65,11 +65,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        drippingInjection(const drippingInjection&);
+        //- No copy construct
+        drippingInjection(const drippingInjection&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const drippingInjection&);
+        //- No copy assignment
+        void operator=(const drippingInjection&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H
index 173bb01fe4..b88b6024f7 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H
@@ -66,11 +66,11 @@ class injectionModel
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        injectionModel(const injectionModel&);
+        //- No copy construct
+        injectionModel(const injectionModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const injectionModel&);
+        //- No copy assignment
+        void operator=(const injectionModel&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H
index c20269c20f..c71c42f022 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H
@@ -67,11 +67,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        injectionModelList(const injectionModelList&);
+        //- No copy construct
+        injectionModelList(const injectionModelList&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const injectionModelList&);
+        //- No copy assignment
+        void operator=(const injectionModelList&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H
index 7b3b33c08e..f8e1d57ced 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H
@@ -57,11 +57,11 @@ class patchInjection
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        patchInjection(const patchInjection&);
+        //- No copy construct
+        patchInjection(const patchInjection&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const patchInjection&);
+        //- No copy assignment
+        void operator=(const patchInjection&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModel.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModel.H
index c965f231e1..c074a6a3ab 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModel.H
@@ -66,11 +66,11 @@ class transferModel
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        transferModel(const transferModel&);
+        //- No copy construct
+        transferModel(const transferModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const transferModel&);
+        //- No copy assignment
+        void operator=(const transferModel&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModelList/transferModelList.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModelList/transferModelList.H
index 9af147c8d5..89acf58b37 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModelList/transferModelList.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModelList/transferModelList.H
@@ -65,11 +65,11 @@ class transferModelList
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        transferModelList(const transferModelList&);
+        //- No copy construct
+        transferModelList(const transferModelList&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const transferModelList&);
+        //- No copy assignment
+        void operator=(const transferModelList&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
index 759f57af30..cbcfa4783c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
@@ -80,11 +80,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        constantRadiation(const constantRadiation&);
+        //- No copy construct
+        constantRadiation(const constantRadiation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const constantRadiation&);
+        //- No copy assignment
+        void operator=(const constantRadiation&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
index acaf6b1476..8fc836af23 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
@@ -60,11 +60,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        filmRadiationModel(const filmRadiationModel&);
+        //- No copy construct
+        filmRadiationModel(const filmRadiationModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const filmRadiationModel&);
+        //- No copy assignment
+        void operator=(const filmRadiationModel&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
index 6fd82b6979..d65292f989 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
@@ -59,11 +59,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        noRadiation(const noRadiation&);
+        //- No copy construct
+        noRadiation(const noRadiation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const noRadiation&);
+        //- No copy assignment
+        void operator=(const noRadiation&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
index 919ecd2e86..13a6409051 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
@@ -66,11 +66,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        primaryRadiation(const primaryRadiation&);
+        //- No copy construct
+        primaryRadiation(const primaryRadiation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const primaryRadiation&);
+        //- No copy assignment
+        void operator=(const primaryRadiation&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
index c64c2f5abe..eff356e63a 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
@@ -90,12 +90,6 @@ standardRadiation::standardRadiation
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-standardRadiation::~standardRadiation()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void standardRadiation::correct()
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
index 3c6e8a4a1d..860b9af1b2 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
@@ -77,11 +77,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        standardRadiation(const standardRadiation&);
+        //- No copy construct
+        standardRadiation(const standardRadiation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const standardRadiation&);
+        //- No copy assignment
+        void operator=(const standardRadiation&) = delete;
 
 
 public:
@@ -101,7 +101,7 @@ public:
 
 
     //- Destructor
-    virtual ~standardRadiation();
+    virtual ~standardRadiation() = default;
 
 
     // Member Functions
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.H
index d0f32bf758..0eedacbb0a 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.H
@@ -65,11 +65,11 @@ class ArrheniusViscosity
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        ArrheniusViscosity(const ArrheniusViscosity&);
+        //- No copy construct
+        ArrheniusViscosity(const ArrheniusViscosity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const ArrheniusViscosity&);
+        //- No copy assignment
+        void operator=(const ArrheniusViscosity&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H
index c517030bf2..2c1109e6b8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H
@@ -56,11 +56,11 @@ class constantViscosity
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        constantViscosity(const constantViscosity&);
+        //- No copy construct
+        constantViscosity(const constantViscosity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const constantViscosity&);
+        //- No copy assignment
+        void operator=(const constantViscosity&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H
index 3826f1d982..c9b0e3c94c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H
@@ -61,11 +61,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        filmViscosityModel(const filmViscosityModel&);
+        //- No copy construct
+        filmViscosityModel(const filmViscosityModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const filmViscosityModel&);
+        //- No copy assignment
+        void operator=(const filmViscosityModel&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/function1Viscosity/function1Viscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/function1Viscosity/function1Viscosity.H
index 7584d2a5f4..239b4b41c2 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/function1Viscosity/function1Viscosity.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/function1Viscosity/function1Viscosity.H
@@ -58,11 +58,11 @@ class function1Viscosity
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        function1Viscosity(const function1Viscosity&);
+        //- No copy construct
+        function1Viscosity(const function1Viscosity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const function1Viscosity&);
+        //- No copy assignment
+        void operator=(const function1Viscosity&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H
index f89be106fd..e5132f2f70 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H
@@ -58,11 +58,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        liquidViscosity(const liquidViscosity&);
+        //- No copy construct
+        liquidViscosity(const liquidViscosity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const liquidViscosity&);
+        //- No copy assignment
+        void operator=(const liquidViscosity&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H
index 6dbf50ba66..e9b0e25fcc 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H
@@ -91,11 +91,11 @@ class thixotropicViscosity
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        thixotropicViscosity(const thixotropicViscosity&);
+        //- No copy construct
+        thixotropicViscosity(const thixotropicViscosity&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const thixotropicViscosity&);
+        //- No copy assignment
+        void operator=(const thixotropicViscosity&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
index 5603e5ddd3..7fda3a5f25 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
@@ -65,11 +65,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        constantHeatTransfer(const constantHeatTransfer&);
+        //- No copy construct
+        constantHeatTransfer(const constantHeatTransfer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const constantHeatTransfer&);
+        //- No copy assignment
+        void operator=(const constantHeatTransfer&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
index 3b9e911863..f31ea31fcc 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
@@ -60,11 +60,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        heatTransferModel(const heatTransferModel&);
+        //- No copy construct
+        heatTransferModel(const heatTransferModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const heatTransferModel&);
+        //- No copy assignment
+        void operator=(const heatTransferModel&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
index 26d66f42b3..c91b39187a 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
@@ -71,11 +71,14 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        mappedConvectiveHeatTransfer(const mappedConvectiveHeatTransfer&);
+        //- No copy construct
+        mappedConvectiveHeatTransfer
+        (
+            const mappedConvectiveHeatTransfer&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const mappedConvectiveHeatTransfer&);
+        //- No copy assignment
+        void operator=(const mappedConvectiveHeatTransfer&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
index bca13b63c1..ee089d509a 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
@@ -58,11 +58,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        noPhaseChange(const noPhaseChange&);
+        //- No copy construct
+        noPhaseChange(const noPhaseChange&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const noPhaseChange&);
+        //- No copy assignment
+        void operator=(const noPhaseChange&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
index d544259159..375bf5dc7f 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
@@ -61,11 +61,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        phaseChangeModel(const phaseChangeModel&);
+        //- No copy construct
+        phaseChangeModel(const phaseChangeModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const phaseChangeModel&);
+        //- No copy assignment
+        void operator=(const phaseChangeModel&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
index baf115767b..eb1ed51c72 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
@@ -58,11 +58,11 @@ class solidification
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        solidification(const solidification&);
+        //- No copy construct
+        solidification(const solidification&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const solidification&);
+        //- No copy assignment
+        void operator=(const solidification&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
index 128b529e11..4c9a09d174 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
@@ -81,12 +81,6 @@ standardPhaseChange::standardPhaseChange
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-standardPhaseChange::~standardPhaseChange()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void standardPhaseChange::correctModel
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
index 55007cc6c6..03b861c04d 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
@@ -54,17 +54,6 @@ class standardPhaseChange
 :
     public phaseChangeModel
 {
-private:
-
-    // Private member functions
-
-        //- Disallow default bitwise copy construct
-        standardPhaseChange(const standardPhaseChange&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const standardPhaseChange&);
-
-
 protected:
 
     // Protected data
@@ -85,6 +74,12 @@ protected:
         //- Return Sherwood number as a function of Reynolds and Schmidt numbers
         scalar Sh(const scalar Re, const scalar Sc) const;
 
+        //- No copy construct
+        standardPhaseChange(const standardPhaseChange&) = delete;
+
+        //- No copy assignment
+        void operator=(const standardPhaseChange&) = delete;
+
 
 public:
 
@@ -103,7 +98,7 @@ public:
 
 
     //- Destructor
-    virtual ~standardPhaseChange();
+    virtual ~standardPhaseChange() = default;
 
 
     // Member Functions
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
index 2e72e8d6b0..81255e09e3 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
@@ -55,11 +55,11 @@ class surfaceFilmModel
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        surfaceFilmModel(const surfaceFilmModel&);
+        //- No copy construct
+        surfaceFilmModel(const surfaceFilmModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const surfaceFilmModel&);
+        //- No copy assignment
+        void operator=(const surfaceFilmModel&) = delete;
 
 
 public:
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModel.H b/src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModel.H
index 526fc3ed8b..28cc1ba5b1 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModel.H
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModel.H
@@ -58,11 +58,11 @@ class surfaceFilmRegionModel
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        surfaceFilmRegionModel(const surfaceFilmRegionModel&);
+        //- No copy construct
+        surfaceFilmRegionModel(const surfaceFilmRegionModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const surfaceFilmRegionModel&);
+        //- No copy assignment
+        void operator=(const surfaceFilmRegionModel&) = delete;
 
 
 protected:
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
index a2059ecc62..39807e9f64 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
@@ -69,11 +69,11 @@ class thermoSingleLayer
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        thermoSingleLayer(const thermoSingleLayer&);
+        //- No copy construct
+        thermoSingleLayer(const thermoSingleLayer&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const thermoSingleLayer&);
+        //- No copy assignment
+        void operator=(const thermoSingleLayer&) = delete;
 
         //- Return boundary types for sensible enthalpy field
         wordList hsBoundaryTypes();
diff --git a/src/regionModels/thermalBaffleModels/noThermo/noThermo.H b/src/regionModels/thermalBaffleModels/noThermo/noThermo.H
index bf1a4d8338..9b733085c4 100644
--- a/src/regionModels/thermalBaffleModels/noThermo/noThermo.H
+++ b/src/regionModels/thermalBaffleModels/noThermo/noThermo.H
@@ -59,11 +59,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        noThermo(const noThermo&);
+        //- No copy construct
+        noThermo(const noThermo&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const noThermo&);
+        //- No copy assignment
+        void operator=(const noThermo&) = delete;
 
 
 protected:
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H
index 9016284b60..7c781dac86 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H
@@ -62,11 +62,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        thermalBaffle(const thermalBaffle&);
+        //- No copy construct
+        thermalBaffle(const thermalBaffle&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const thermalBaffle&);
+        //- No copy assignment
+        void operator=(const thermalBaffle&) = delete;
 
         //- Initialize thermalBaffle
         void init();
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.H b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.H
index 2084de8b02..975726a3f2 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.H
+++ b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.H
@@ -64,11 +64,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        thermalBaffleModel(const thermalBaffleModel&);
+        //- No copy construct
+        thermalBaffleModel(const thermalBaffleModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const thermalBaffleModel&);
+        //- No copy assignment
+        void operator=(const thermalBaffleModel&) = delete;
 
         //- Initialize thermal Baffle
         void init();
diff --git a/src/renumber/SloanRenumber/SloanRenumber.H b/src/renumber/SloanRenumber/SloanRenumber.H
index 528319b8fe..3ec304d99d 100644
--- a/src/renumber/SloanRenumber/SloanRenumber.H
+++ b/src/renumber/SloanRenumber/SloanRenumber.H
@@ -58,9 +58,11 @@ class SloanRenumber
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        void operator=(const SloanRenumber&);
-        SloanRenumber(const SloanRenumber&);
+        //- No copy construct
+        SloanRenumber(const SloanRenumber&) = delete;
+
+        //- No copy assignment
+        void operator=(const SloanRenumber&) = delete;
 
 
 public:
diff --git a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H
index a48e393365..2285193dd6 100644
--- a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H
+++ b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H
@@ -56,9 +56,11 @@ class CuthillMcKeeRenumber
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        void operator=(const CuthillMcKeeRenumber&);
-        CuthillMcKeeRenumber(const CuthillMcKeeRenumber&);
+        //- No copy construct
+        CuthillMcKeeRenumber(const CuthillMcKeeRenumber&) = delete;
+
+        //- No copy assignment
+        void operator=(const CuthillMcKeeRenumber&) = delete;
 
 
 public:
@@ -74,8 +76,7 @@ public:
 
 
     //- Destructor
-    virtual ~CuthillMcKeeRenumber()
-    {}
+    virtual ~CuthillMcKeeRenumber() = default;
 
 
     // Member Functions
diff --git a/src/renumber/renumberMethods/manualRenumber/manualRenumber.H b/src/renumber/renumberMethods/manualRenumber/manualRenumber.H
index 7a8e5f1ebe..b9cdb2919e 100644
--- a/src/renumber/renumberMethods/manualRenumber/manualRenumber.H
+++ b/src/renumber/renumberMethods/manualRenumber/manualRenumber.H
@@ -55,10 +55,11 @@ class manualRenumber
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        void operator=(const manualRenumber&);
-        manualRenumber(const manualRenumber&);
+        //- No copy construct
+        manualRenumber(const manualRenumber&) = delete;
 
+        //- No copy assignment
+        void operator=(const manualRenumber&) = delete;
 
 public:
 
@@ -73,8 +74,7 @@ public:
 
 
     //- Destructor
-    virtual ~manualRenumber()
-    {}
+    virtual ~manualRenumber() = default;
 
 
     // Member Functions
diff --git a/src/renumber/renumberMethods/randomRenumber/randomRenumber.H b/src/renumber/renumberMethods/randomRenumber/randomRenumber.H
index 571efc2833..4c5bd27a21 100644
--- a/src/renumber/renumberMethods/randomRenumber/randomRenumber.H
+++ b/src/renumber/renumberMethods/randomRenumber/randomRenumber.H
@@ -50,9 +50,11 @@ class randomRenumber
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        void operator=(const randomRenumber&);
-        randomRenumber(const randomRenumber&);
+        //- No copy construct
+        randomRenumber(const randomRenumber&) = delete;
+
+        //- No copy assignment
+        void operator=(const randomRenumber&) = delete;
 
 
 public:
@@ -68,8 +70,7 @@ public:
 
 
     //- Destructor
-    virtual ~randomRenumber()
-    {}
+    virtual ~randomRenumber() = default;
 
 
     // Member Functions
diff --git a/src/renumber/renumberMethods/renumberMethod/renumberMethod.H b/src/renumber/renumberMethods/renumberMethod/renumberMethod.H
index deb11ce1d7..4978e59e7b 100644
--- a/src/renumber/renumberMethods/renumberMethod/renumberMethod.H
+++ b/src/renumber/renumberMethods/renumberMethod/renumberMethod.H
@@ -59,9 +59,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        renumberMethod(const renumberMethod&);
-        void operator=(const renumberMethod&);
+        //- No copy construct
+        renumberMethod(const renumberMethod&) = delete;
+
+        //- No copy assignment
+        void operator=(const renumberMethod&) = delete;
 
 
 public:
@@ -103,8 +105,7 @@ public:
 
 
     //- Destructor
-    virtual ~renumberMethod()
-    {}
+    virtual ~renumberMethod() = default;
 
 
     // Member Functions
diff --git a/src/renumber/renumberMethods/springRenumber/springRenumber.H b/src/renumber/renumberMethods/springRenumber/springRenumber.H
index 5e39437257..bb94ba0a4e 100644
--- a/src/renumber/renumberMethods/springRenumber/springRenumber.H
+++ b/src/renumber/renumberMethods/springRenumber/springRenumber.H
@@ -71,9 +71,11 @@ class springRenumber
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        void operator=(const springRenumber&);
-        springRenumber(const springRenumber&);
+        //- No copy construct
+        springRenumber(const springRenumber&) = delete;
+
+        //- No copy assignment
+        void operator=(const springRenumber&) = delete;
 
 
 public:
@@ -89,8 +91,7 @@ public:
 
 
     //- Destructor
-    virtual ~springRenumber()
-    {}
+    virtual ~springRenumber() = default;
 
 
     // Member Functions
diff --git a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
index 3f65eb2eab..65ad63fe19 100644
--- a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
+++ b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
@@ -102,10 +102,12 @@ public:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        void operator=(const structuredRenumber&) = delete;
+        //- No copy construct
         structuredRenumber(const structuredRenumber&) = delete;
 
+        //- No copy assignment
+        void operator=(const structuredRenumber&) = delete;
+
 
 public:
 
diff --git a/src/renumber/zoltanRenumber/zoltanRenumber.H b/src/renumber/zoltanRenumber/zoltanRenumber.H
index 4baffafe72..7c35dfc891 100644
--- a/src/renumber/zoltanRenumber/zoltanRenumber.H
+++ b/src/renumber/zoltanRenumber/zoltanRenumber.H
@@ -56,9 +56,11 @@ class zoltanRenumber
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        void operator=(const zoltanRenumber&);
-        zoltanRenumber(const zoltanRenumber&);
+        //- No copy construct
+        zoltanRenumber(const zoltanRenumber&) = delete;
+
+        //- No copy assignment
+        void operator=(const zoltanRenumber&) = delete;
 
 
 public:
@@ -74,8 +76,7 @@ public:
 
 
     //- Destructor
-    virtual ~zoltanRenumber()
-    {}
+    virtual ~zoltanRenumber() = default;
 
 
     // Member Functions
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
index d065d9797c..0d5a460c5a 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.H
@@ -100,11 +100,11 @@ class rigidBodyMotion
         //- Initialize the body-state
         void initialize();
 
-        //- Disallow copy construct
-        rigidBodyMotion(const rigidBodyMotion&);
+        //- No copy construct
+        rigidBodyMotion(const rigidBodyMotion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const rigidBodyMotion&);
+        //- No copy assignment
+        void operator=(const rigidBodyMotion&) = delete;
 
 
 public:
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
index 99c374b064..8972db8bff 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
@@ -128,10 +128,10 @@ class rigidBodyMeshMotion
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         rigidBodyMeshMotion(const rigidBodyMeshMotion&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const rigidBodyMeshMotion&) = delete;
 
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
index d7e77c79bb..4e8e165726 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
@@ -115,14 +115,14 @@ class rigidBodyMeshMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         rigidBodyMeshMotionSolver
         (
             const rigidBodyMeshMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const rigidBodyMeshMotionSolver&);
+        //- No copy assignment
+        void operator=(const rigidBodyMeshMotionSolver&) = delete;
 
 
 public:
diff --git a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
index 1576dcdb3b..132d317fa2 100644
--- a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
@@ -98,11 +98,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        cellVolumeWeightMethod(const cellVolumeWeightMethod&);
+        //- No copy construct
+        cellVolumeWeightMethod(const cellVolumeWeightMethod&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const cellVolumeWeightMethod&);
+        //- No copy assignment
+        void operator=(const cellVolumeWeightMethod&) = delete;
 
 
 public:
diff --git a/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.H b/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.H
index 7c38c4dee3..ef316a75ff 100644
--- a/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.H
@@ -72,11 +72,14 @@ protected:
             label& startSeedI
         );
 
-        //- Disallow default bitwise copy construct
-        correctedCellVolumeWeightMethod(const correctedCellVolumeWeightMethod&);
+        //- No copy construct
+        correctedCellVolumeWeightMethod
+        (
+            const correctedCellVolumeWeightMethod&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const correctedCellVolumeWeightMethod&);
+        //- No copy assignment
+        void operator=(const correctedCellVolumeWeightMethod&) = delete;
 
 
 public:
diff --git a/src/sampling/meshToMesh/calcMethod/direct/directMethod.H b/src/sampling/meshToMesh/calcMethod/direct/directMethod.H
index fcb9615145..e5081668e0 100644
--- a/src/sampling/meshToMesh/calcMethod/direct/directMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/direct/directMethod.H
@@ -103,11 +103,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        directMethod(const directMethod&);
+        //- No copy construct
+        directMethod(const directMethod&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const directMethod&);
+        //- No copy assignment
+        void operator=(const directMethod&) = delete;
 
 
 public:
diff --git a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H
index 87877c4747..278a156a1c 100644
--- a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H
@@ -111,11 +111,11 @@ protected:
             const List<DynamicList<label>>& tgtToSrc
         ) const;
 
-        //- Disallow default bitwise copy construct
-        mapNearestMethod(const mapNearestMethod&);
+        //- No copy construct
+        mapNearestMethod(const mapNearestMethod&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const mapNearestMethod&);
+        //- No copy assignment
+        void operator=(const mapNearestMethod&) = delete;
 
 
 public:
diff --git a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
index 244011d423..6bbb84fad9 100644
--- a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
@@ -114,11 +114,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        meshToMeshMethod(const meshToMeshMethod&);
+        //- No copy construct
+        meshToMeshMethod(const meshToMeshMethod&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const meshToMeshMethod&);
+        //- No copy assignment
+        void operator=(const meshToMeshMethod&) = delete;
 
 
 public:
diff --git a/src/sampling/meshToMesh/meshToMesh.H b/src/sampling/meshToMesh/meshToMesh.H
index ab737f3a95..e1567c18a4 100644
--- a/src/sampling/meshToMesh/meshToMesh.H
+++ b/src/sampling/meshToMesh/meshToMesh.H
@@ -282,11 +282,11 @@ private:
             ) const;
 
 
-        //- Disallow default bitwise copy construct
-        meshToMesh(const meshToMesh&);
+        //- No copy construct
+        meshToMesh(const meshToMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const meshToMesh&);
+        //- No copy assignment
+        void operator=(const meshToMesh&) = delete;
 
 
 public:
diff --git a/src/sampling/probes/patchProbes.H b/src/sampling/probes/patchProbes.H
index 02ec2b4b25..9344c99376 100644
--- a/src/sampling/probes/patchProbes.H
+++ b/src/sampling/probes/patchProbes.H
@@ -147,11 +147,11 @@ protected:
 
 private:
 
-        //- Disallow default bitwise copy construct
-        patchProbes(const patchProbes&);
+        //- No copy construct
+        patchProbes(const patchProbes&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const patchProbes&);
+        //- No copy assignment
+        void operator=(const patchProbes&) = delete;
 
 
 public:
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index 0bfe06abb3..bc73ce8f90 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -227,10 +227,10 @@ private:
         template<class Type>
         void sampleAndWriteSurfaceFields(const fieldGroup<Type>&);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         probes(const probes&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const probes&) = delete;
 
 
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index 9769ee3d6a..9ae1bd01f2 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -240,8 +240,10 @@ class sampledSets
         void sampleAndWrite(fieldGroup<Type>& fields);
 
 
-        //- Disallow default bitwise copy construct and assignment
+        //- No copy construct
         sampledSets(const sampledSets&) = delete;
+
+        //- No copy assignment
         void operator=(const sampledSets&) = delete;
 
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
index 9a8103976c..040ce0077c 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
@@ -94,14 +94,14 @@ class sixDoFRigidBodyMotionSolver
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         sixDoFRigidBodyMotionSolver
         (
             const sixDoFRigidBodyMotionSolver&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const sixDoFRigidBodyMotionSolver&);
+        //- No copy assignment
+        void operator=(const sixDoFRigidBodyMotionSolver&) = delete;
 
 
 public:
diff --git a/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H
index c260dbb4d0..e33161d3be 100644
--- a/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H
+++ b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H
@@ -96,11 +96,11 @@ class sixDoFRigidBodyState
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        sixDoFRigidBodyState(const sixDoFRigidBodyState&);
+        //- No copy construct
+        sixDoFRigidBodyState(const sixDoFRigidBodyState&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const sixDoFRigidBodyState&);
+        //- No copy assignment
+        void operator=(const sixDoFRigidBodyState&) = delete;
 
 
 protected:
diff --git a/src/surfMesh/mergedSurf/mergedSurf.H b/src/surfMesh/mergedSurf/mergedSurf.H
index b4d63a0ba9..fea99158a2 100644
--- a/src/surfMesh/mergedSurf/mergedSurf.H
+++ b/src/surfMesh/mergedSurf/mergedSurf.H
@@ -55,7 +55,7 @@ class mergedSurf
     labelList  zones_;
     labelList  pointsMap_;
 
-    //- Disallow default bitwise copy construct
+    //- No copy construct
     mergedSurf(const mergedSurf&) = delete;
 
     // Assignment is needed for lists
diff --git a/src/surfMesh/meshedSurf/meshedSurfRef.H b/src/surfMesh/meshedSurf/meshedSurfRef.H
index a0a15b8df0..cd60394e19 100644
--- a/src/surfMesh/meshedSurf/meshedSurfRef.H
+++ b/src/surfMesh/meshedSurf/meshedSurfRef.H
@@ -57,7 +57,7 @@ class meshedSurfRef
         //- No copy construct
         meshedSurfRef(const meshedSurfRef&) = delete;
 
-        //- No copy construct assignment
+        //- No copy assignment
         void operator=(const meshedSurfRef&) = delete;
 
 public:
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
index 1617d8c3de..85b932e4ea 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
@@ -66,10 +66,10 @@ class AC3DsurfaceFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         AC3DsurfaceFormat(const AC3DsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const AC3DsurfaceFormat<Face>&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.H b/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.H
index d4acfc6b7f..4d3de24f58 100644
--- a/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.H
@@ -61,10 +61,10 @@ class FLMAsurfaceFormat
         static inline void writeShell(OSstream& os, const Face& f);
         static inline void writeType(OSstream& os, const Face& f);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         FLMAsurfaceFormat(const FLMAsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const FLMAsurfaceFormat<Face>&) = delete;
 
 
@@ -138,10 +138,10 @@ class FLMAZsurfaceFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         FLMAZsurfaceFormat(const FLMAZsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const FLMAZsurfaceFormat<Face>&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
index 6e6b656723..bb113f625c 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
@@ -64,10 +64,10 @@ class GTSsurfaceFormat
         //  Triangulating on-the-fly is otherwise too annoying
         static bool checkIfTriangulated(const UList<Face>& faceLst);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         GTSsurfaceFormat(const GTSsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const GTSsurfaceFormat<Face>&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
index 69c9240ed3..6220af3a50 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
@@ -76,10 +76,10 @@ class NASsurfaceFormat
             label elementId
         );
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         NASsurfaceFormat(const NASsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const NASsurfaceFormat<Face>&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
index 61529c4fdd..65f4ef2885 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
@@ -59,10 +59,10 @@ class OBJsurfaceFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         OBJsurfaceFormat(const OBJsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const OBJsurfaceFormat<Face>&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
index bfff7e1b15..1eab499a6c 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
@@ -66,10 +66,10 @@ class OFFsurfaceFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         OFFsurfaceFormat(const OFFsurfaceFormat&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const OFFsurfaceFormat&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
index 18b40854b3..9286e25df1 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
@@ -63,10 +63,10 @@ class SMESHsurfaceFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         SMESHsurfaceFormat(const SMESHsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const SMESHsurfaceFormat<Face>&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
index c8a1f99543..e54db0cb35 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
@@ -73,10 +73,10 @@ class STARCDsurfaceFormat
             const label cellTableId
         );
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         STARCDsurfaceFormat(const STARCDsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const STARCDsurfaceFormat<Face>&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/tri/TRIReader.H b/src/surfMesh/surfaceFormats/tri/TRIReader.H
index 00c117f58c..e66e783cb1 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIReader.H
+++ b/src/surfMesh/surfaceFormats/tri/TRIReader.H
@@ -78,10 +78,10 @@ class TRIReader
 
         bool readFile(const fileName& filename);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         TRIReader(const TRIReader&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         TRIReader& operator=(const TRIReader&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
index 9315904134..74e4a07733 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
@@ -69,10 +69,10 @@ class TRIsurfaceFormat
             const label zoneI
         );
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         TRIsurfaceFormat(const TRIsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const TRIsurfaceFormat<Face>&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
index 932a40a3f1..5463ca4eee 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
@@ -69,10 +69,10 @@ class VTKsurfaceFormat
         );
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         VTKsurfaceFormat(const VTKsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const VTKsurfaceFormat<Face>&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H
index de8fbe4cc0..259f2fffc0 100644
--- a/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/vtp/VTPsurfaceFormat.H
@@ -69,10 +69,10 @@ class VTPsurfaceFormat
         );
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         VTPsurfaceFormat(const VTPsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const VTPsurfaceFormat<Face>&) = delete;
 
 
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
index 8cb11eec44..d03b7fd6e4 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
@@ -59,10 +59,10 @@ class X3DsurfaceFormat
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         X3DsurfaceFormat(const X3DsurfaceFormat<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const X3DsurfaceFormat<Face>&) = delete;
 
 public:
diff --git a/src/surfMesh/surfaceRegistry/surfaceRegistry.H b/src/surfMesh/surfaceRegistry/surfaceRegistry.H
index f412f1d03c..a2566ccba0 100644
--- a/src/surfMesh/surfaceRegistry/surfaceRegistry.H
+++ b/src/surfMesh/surfaceRegistry/surfaceRegistry.H
@@ -53,10 +53,10 @@ class surfaceRegistry
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         surfaceRegistry(const surfaceRegistry&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         surfaceRegistry& operator=(const surfaceRegistry&) = delete;
 
 
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
index cd83bc84f3..1082f370e1 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
@@ -74,11 +74,14 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        barotropicCompressibilityModel(const barotropicCompressibilityModel&);
+        //- No copy construct
+        barotropicCompressibilityModel
+        (
+            const barotropicCompressibilityModel&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const barotropicCompressibilityModel&);
+        //- No copy assignment
+        void operator=(const barotropicCompressibilityModel&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.H
index ac8c6a6228..aa09391f2e 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.H
@@ -129,11 +129,11 @@ class TDACChemistryModel
 
     // Private Member Functions
 
-        //- Disallow copy constructor
-        TDACChemistryModel(const TDACChemistryModel&);
+        //- No copy construct
+        TDACChemistryModel(const TDACChemistryModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const TDACChemistryModel&);
+        //- No copy assignment
+        void operator=(const TDACChemistryModel&) = delete;
 
         //- Solve the reaction system for the given time step
         //  of given type and return the characteristic time
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.H b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.H
index 83a0ddbad3..8f87e9ca35 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.H
@@ -118,8 +118,8 @@ class ISAT
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        ISAT(const ISAT&);
+        //- No copy construct
+        ISAT(const ISAT&) = delete;
 
         //- Add a chemPoint to the MRU list
         void addToMRU(chemPointISAT<CompType, ThermoType>* phi0);
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/noChemistryTabulation/noChemistryTabulation.H b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/noChemistryTabulation/noChemistryTabulation.H
index 9b78001386..a02cf7fa5b 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/noChemistryTabulation/noChemistryTabulation.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/noChemistryTabulation/noChemistryTabulation.H
@@ -51,8 +51,8 @@ class none
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        none(const none&);
+        //- No copy construct
+        none(const none&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
index 4ced57f8ed..eb6bf75739 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
@@ -62,8 +62,8 @@ class basicChemistryModel
         //- Construct as copy (not implemented)
         basicChemistryModel(const basicChemistryModel&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const basicChemistryModel&);
+        //- No copy assignment
+        void operator=(const basicChemistryModel&) = delete;
 
 
 protected:
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
index a19d7fdcdf..9d05b4c10c 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
@@ -68,11 +68,11 @@ class chemistryModel
         template<class DeltaTType>
         scalar solve(const DeltaTType& deltaT);
 
-        //- Disallow copy constructor
-        chemistryModel(const chemistryModel&);
+        //- No copy construct
+        chemistryModel(const chemistryModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const chemistryModel&);
+        //- No copy assignment
+        void operator=(const chemistryModel&) = delete;
 
 
 protected:
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
index 132999f78b..34641ddad8 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModel.H
@@ -63,8 +63,8 @@ class psiChemistryModel
         //- Construct as copy (not implemented)
         psiChemistryModel(const psiChemistryModel&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const psiChemistryModel&);
+        //- No copy assignment
+        void operator=(const psiChemistryModel&) = delete;
 
 
 protected:
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
index 3d160fa024..aafe3e327c 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
@@ -63,8 +63,8 @@ class rhoChemistryModel
         //- Construct as copy (not implemented)
         rhoChemistryModel(const rhoChemistryModel&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const rhoChemistryModel&);
+        //- No copy assignment
+        void operator=(const rhoChemistryModel&) = delete;
 
 
 protected:
diff --git a/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.H b/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.H
index 7b61a0aeef..5e89180183 100644
--- a/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.H
+++ b/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.H
@@ -76,11 +76,11 @@ class specieReactionRates
         //- File header information
         virtual void writeFileHeader(Ostream& os) const;
 
-        //- Disallow default bitwise copy construct
-        specieReactionRates(const specieReactionRates&);
+        //- No copy construct
+        specieReactionRates(const specieReactionRates&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const specieReactionRates&);
+        //- No copy assignment
+        void operator=(const specieReactionRates&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.H b/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.H
index 26be2ff2f0..5caccc174c 100644
--- a/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.H
+++ b/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.H
@@ -71,11 +71,11 @@ class radiation
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        radiation(const radiation&);
+        //- No copy construct
+        radiation(const radiation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const radiation&);
+        //- No copy assignment
+        void operator=(const radiation&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/radiation/radiationModels/P1/P1.H b/src/thermophysicalModels/radiation/radiationModels/P1/P1.H
index 6532f8223c..cb07f44255 100644
--- a/src/thermophysicalModels/radiation/radiationModels/P1/P1.H
+++ b/src/thermophysicalModels/radiation/radiationModels/P1/P1.H
@@ -82,11 +82,11 @@ class P1
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        P1(const P1&);
+        //- No copy construct
+        P1(const P1&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const P1&);
+        //- No copy assignment
+        void operator=(const P1&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
index 048479b50d..7642b652ff 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
@@ -160,11 +160,11 @@ class fvDOM
         //- Initialise
         void initialise();
 
-        //- Disallow default bitwise copy construct
-        fvDOM(const fvDOM&);
+        //- No copy construct
+        fvDOM(const fvDOM&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const fvDOM&);
+        //- No copy assignment
+        void operator=(const fvDOM&) = delete;
 
         //- Update black body emission
         void updateBlackBodyEmission();
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
index d60d0a7bfe..87cb15782b 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
@@ -118,11 +118,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        radiativeIntensityRay(const radiativeIntensityRay&);
+        //- No copy construct
+        radiativeIntensityRay(const radiativeIntensityRay&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const radiativeIntensityRay&);
+        //- No copy assignment
+        void operator=(const radiativeIntensityRay&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H
index c3640623b2..c63613eefd 100644
--- a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H
+++ b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H
@@ -58,11 +58,11 @@ class noRadiation
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        noRadiation(const noRadiation&);
+        //- No copy construct
+        noRadiation(const noRadiation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const noRadiation&);
+        //- No copy assignment
+        void operator=(const noRadiation&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H
index d477df60ce..36d6509e5f 100644
--- a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H
+++ b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H
@@ -59,11 +59,11 @@ class opaqueSolid
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        opaqueSolid(const opaqueSolid&);
+        //- No copy construct
+        opaqueSolid(const opaqueSolid&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const opaqueSolid&);
+        //- No copy assignment
+        void operator=(const opaqueSolid&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
index 6b21a8dbb2..0518aafdbd 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
@@ -135,11 +135,11 @@ private:
         //- Initialise
         void initialise();
 
-        //- Disallow default bitwise copy construct
-        radiationModel(const radiationModel&);
+        //- No copy construct
+        radiationModel(const radiationModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const radiationModel&);
+        //- No copy assignment
+        void operator=(const radiationModel&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceShading/faceShading.H b/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceShading/faceShading.H
index e2b426b24d..97db3890eb 100644
--- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceShading/faceShading.H
+++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceShading/faceShading.H
@@ -91,11 +91,11 @@ class faceShading
             const pointField& myFc
         );
 
-        //- Disallow default bitwise copy construct
-        faceShading(const faceShading&);
+        //- No copy construct
+        faceShading(const faceShading&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const faceShading&);
+        //- No copy assignment
+        void operator=(const faceShading&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H
index 815ba6d5ad..9b646352de 100644
--- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H
+++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H
@@ -187,11 +187,11 @@ private:
         //- Update absorptivity
         void updateAbsorptivity(const labelHashSet& includePatches);
 
-        //- Disallow default bitwise copy construct
-        solarLoad(const solarLoad&);
+        //- No copy construct
+        solarLoad(const solarLoad&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const solarLoad&);
+        //- No copy assignment
+        void operator=(const solarLoad&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H
index 92ec802b45..6c70e4bee8 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H
@@ -140,11 +140,11 @@ protected:
             scalarSquareMatrix& matrix
         );
 
-        //- Disallow default bitwise copy construct
-        viewFactor(const viewFactor&);
+        //- No copy construct
+        viewFactor(const viewFactor&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const viewFactor&);
+        //- No copy assignment
+        void operator=(const viewFactor&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
index 719c2c6af6..3160f4bb90 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
@@ -194,11 +194,11 @@ private:
         scalar startTime_;
 
 
-        //- Disallow default bitwise copy construct
-        solarCalculator(const solarCalculator&);
+        //- No copy construct
+        solarCalculator(const solarCalculator&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const solarCalculator&);
+        //- No copy assignment
+        void operator=(const solarCalculator&) = delete;
 
 
     // Private members
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
index 91f7866081..c9a2e1fc6a 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
@@ -61,11 +61,11 @@ class chemistryReader
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        chemistryReader(const chemistryReader&);
+        //- No copy construct
+        chemistryReader(const chemistryReader&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const chemistryReader&);
+        //- No copy assignment
+        void operator=(const chemistryReader&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
index 73ae7e35f4..fc550d3063 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
@@ -284,11 +284,11 @@ private:
             const fileName& transportFileName
         );
 
-        //- Disallow default bitwise copy construct
-        chemkinReader(const chemkinReader&);
+        //- No copy construct
+        chemkinReader(const chemkinReader&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const chemkinReader&);
+        //- No copy assignment
+        void operator=(const chemkinReader&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
index 7fcba58a3e..4caa30ee3e 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
@@ -93,11 +93,11 @@ class foamChemistryReader
         //- Read the species composition
         void readSpeciesComposition();
 
-        //- Disallow default bitwise copy construct
-        foamChemistryReader(const foamChemistryReader&);
+        //- No copy construct
+        foamChemistryReader(const foamChemistryReader&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const foamChemistryReader&);
+        //- No copy assignment
+        void operator=(const foamChemistryReader&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H
index d62f7a9bde..d5ed4590f9 100644
--- a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H
+++ b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H
@@ -90,11 +90,11 @@ class moleFractions
         //- Calculate the mole fraction fields
         virtual void calculateMoleFractions();
 
-        //- Disallow default bitwise copy construct
-        moleFractions(const moleFractions&);
+        //- No copy construct
+        moleFractions(const moleFractions&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const moleFractions&);
+        //- No copy assignment
+        void operator=(const moleFractions&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
index e455909893..963d7244b3 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
@@ -67,11 +67,11 @@ class reactingMixture
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        reactingMixture(const reactingMixture&);
+        //- No copy construct
+        reactingMixture(const reactingMixture&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const reactingMixture&);
+        //- No copy assignment
+        void operator=(const reactingMixture&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H
index 10119b24f7..a412090145 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.H
@@ -104,11 +104,11 @@ private:
 
     // Private member functions
 
-        //- Disallow default bitwise copy construct
-        singleStepReactingMixture(const singleStepReactingMixture&);
+        //- No copy construct
+        singleStepReactingMixture(const singleStepReactingMixture&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const singleStepReactingMixture&);
+        //- No copy assignment
+        void operator=(const singleStepReactingMixture&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H
index d8b2a19e3c..a0121bedd1 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H
@@ -64,8 +64,8 @@ class basicSolidChemistryModel
         //- Construct as copy (not implemented)
         basicSolidChemistryModel(const basicSolidChemistryModel&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const basicSolidChemistryModel&);
+        //- No copy assignment
+        void operator=(const basicSolidChemistryModel&) = delete;
 
 
 protected:
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
index 8e1581fd0d..abd49c5bc6 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
@@ -60,8 +60,8 @@ class pyrolysisChemistryModel
 {
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const pyrolysisChemistryModel&);
+        //- No copy assignment
+        void operator=(const pyrolysisChemistryModel&) = delete;
 
 
 protected:
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
index efa71e37be..00a8a2ca53 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
@@ -65,11 +65,11 @@ class solidChemistryModel
 {
     // Private Member Functions
 
-        //- Disallow copy constructor
-        solidChemistryModel(const solidChemistryModel&);
+        //- No copy construct
+        solidChemistryModel(const solidChemistryModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const solidChemistryModel&);
+        //- No copy assignment
+        void operator=(const solidChemistryModel&) = delete;
 
 
 protected:
diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
index fb6eab6709..f04d722fa0 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
@@ -90,8 +90,8 @@ private:
         //- Return string representation of the right of the reaction
         void solidReactionStrRight(OStringStream&) const;
 
-        //- Disallow default bitwise assignment
-        void operator=(const solidReaction&);
+        //- No copy assignment
+        void operator=(const solidReaction&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
index da4c282154..e2959f163f 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
@@ -67,7 +67,7 @@ class IrreversibleReaction
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=
         (
             const IrreversibleReaction
@@ -76,7 +76,7 @@ class IrreversibleReaction
                 ReactionThermo,
                 ReactionRate
             >&
-        );
+        ) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
index 47c3a5c1ce..a9024bac34 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
@@ -68,12 +68,14 @@ class NonEquilibriumReversibleReaction
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=
         (
             const NonEquilibriumReversibleReaction
-                <ReactionType, ReactionThermo, ReactionRate>&
-        );
+            <
+                ReactionType, ReactionThermo, ReactionRate
+            >&
+        ) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
index 6251fda9e4..9af29ff07c 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
@@ -70,8 +70,8 @@ class ReactionList
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const ReactionList&);
+        //- No copy assignment
+        void operator=(const ReactionList&) = delete;
 
 
 public:
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
index f2d957bf85..ab70a86150 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
@@ -67,7 +67,7 @@ class ReversibleReaction
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=
         (
             const ReversibleReaction
@@ -76,7 +76,7 @@ class ReversibleReaction
                 ReactionThermo,
                 ReactionRate
             >&
-        );
+        ) = delete;
 
 
 public:
diff --git a/src/topoChangerFvMesh/dynamicMotionSolverTopoFvMesh/dynamicMotionSolverTopoFvMesh.H b/src/topoChangerFvMesh/dynamicMotionSolverTopoFvMesh/dynamicMotionSolverTopoFvMesh.H
index ad1cb71ba7..e8bc1f1ae5 100644
--- a/src/topoChangerFvMesh/dynamicMotionSolverTopoFvMesh/dynamicMotionSolverTopoFvMesh.H
+++ b/src/topoChangerFvMesh/dynamicMotionSolverTopoFvMesh/dynamicMotionSolverTopoFvMesh.H
@@ -64,11 +64,14 @@ class dynamicMotionSolverTopoFvMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        dynamicMotionSolverTopoFvMesh(const dynamicMotionSolverTopoFvMesh&);
+        //- No copy construct
+        dynamicMotionSolverTopoFvMesh
+        (
+            const dynamicMotionSolverTopoFvMesh&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dynamicMotionSolverTopoFvMesh&);
+        //- No copy assignment
+        void operator=(const dynamicMotionSolverTopoFvMesh&) = delete;
 
 
 public:
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H
index 7fe9ac8f5f..bb3b068509 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H
@@ -62,11 +62,11 @@ class linearValveFvMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        linearValveFvMesh(const linearValveFvMesh&);
+        //- No copy construct
+        linearValveFvMesh(const linearValveFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const linearValveFvMesh&);
+        //- No copy assignment
+        void operator=(const linearValveFvMesh&) = delete;
 
 
         //- Add linearValve zones and modifiers
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H
index 5a9dd3d15c..fc94839522 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H
@@ -59,11 +59,11 @@ class linearValveLayersFvMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        linearValveLayersFvMesh(const linearValveLayersFvMesh&);
+        //- No copy construct
+        linearValveLayersFvMesh(const linearValveLayersFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const linearValveLayersFvMesh&);
+        //- No copy assignment
+        void operator=(const linearValveLayersFvMesh&) = delete;
 
 
         //- Add linearValveLayers zones and modifiers
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
index 8f4136f3c0..5d4eb0c270 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
@@ -70,11 +70,11 @@ class mixerFvMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        mixerFvMesh(const mixerFvMesh&);
+        //- No copy construct
+        mixerFvMesh(const mixerFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const mixerFvMesh&);
+        //- No copy assignment
+        void operator=(const mixerFvMesh&) = delete;
 
 
         //- Add mixer zones and modifiers
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H
index bc366a7032..5ef48481e0 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H
@@ -83,11 +83,11 @@ class movingConeTopoFvMesh
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        movingConeTopoFvMesh(const movingConeTopoFvMesh&);
+        //- No copy construct
+        movingConeTopoFvMesh(const movingConeTopoFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const movingConeTopoFvMesh&);
+        //- No copy assignment
+        void operator=(const movingConeTopoFvMesh&) = delete;
 
 
         //- Add mixer zones and modifiers
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
index 4a81430a7e..204bf0123e 100644
--- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
@@ -70,11 +70,11 @@ class rawTopoChangerFvMesh
         template<class Type, template<class> class PatchField, class GeoMesh>
         void zeroUnmappedValues(const bitSet& mappedFace) const;
 
-        //- Disallow default bitwise copy construct
-        rawTopoChangerFvMesh(const rawTopoChangerFvMesh&);
+        //- No copy construct
+        rawTopoChangerFvMesh(const rawTopoChangerFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const rawTopoChangerFvMesh&);
+        //- No copy assignment
+        void operator=(const rawTopoChangerFvMesh&) = delete;
 
 public:
 
diff --git a/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H b/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
index a47348f27c..059adc8405 100644
--- a/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
+++ b/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
@@ -54,11 +54,11 @@ class topoChangerFvMesh
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        topoChangerFvMesh(const topoChangerFvMesh&);
+        //- No copy construct
+        topoChangerFvMesh(const topoChangerFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const topoChangerFvMesh&);
+        //- No copy assignment
+        void operator=(const topoChangerFvMesh&) = delete;
 
 
 protected:
diff --git a/src/transportModels/compressible/compressibleTransportModel/compressibleTransportModel.H b/src/transportModels/compressible/compressibleTransportModel/compressibleTransportModel.H
index 6b89ac6978..b687e4768f 100644
--- a/src/transportModels/compressible/compressibleTransportModel/compressibleTransportModel.H
+++ b/src/transportModels/compressible/compressibleTransportModel/compressibleTransportModel.H
@@ -53,11 +53,11 @@ class compressibleTransportModel
 {
     // Private Member Functions
 
-        //- Disallow copy construct
-        compressibleTransportModel(const compressibleTransportModel&);
+        //- No copy construct
+        compressibleTransportModel(const compressibleTransportModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const compressibleTransportModel&);
+        //- No copy assignment
+        void operator=(const compressibleTransportModel&) = delete;
 
 
 public:
diff --git a/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H b/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H
index 631108e16e..3075dc5a20 100644
--- a/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H
+++ b/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H
@@ -65,11 +65,11 @@ class singlePhaseTransportModel
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        singlePhaseTransportModel(const singlePhaseTransportModel&);
+        //- No copy construct
+        singlePhaseTransportModel(const singlePhaseTransportModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const singlePhaseTransportModel&);
+        //- No copy assignment
+        void operator=(const singlePhaseTransportModel&) = delete;
 
 
 public:
diff --git a/src/transportModels/incompressible/transportModel/transportModel.H b/src/transportModels/incompressible/transportModel/transportModel.H
index 73d8612d68..0402623c89 100644
--- a/src/transportModels/incompressible/transportModel/transportModel.H
+++ b/src/transportModels/incompressible/transportModel/transportModel.H
@@ -53,11 +53,11 @@ class transportModel
 {
     // Private Member Functions
 
-        //- Disallow copy construct
-        transportModel(const transportModel&);
+        //- No copy construct
+        transportModel(const transportModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const transportModel&);
+        //- No copy assignment
+        void operator=(const transportModel&) = delete;
 
 
 public:
diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
index 0ea74754c6..d73002b577 100644
--- a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
+++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
@@ -78,11 +78,11 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        viscosityModel(const viscosityModel&);
+        //- No copy construct
+        viscosityModel(const viscosityModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const viscosityModel&);
+        //- No copy assignment
+        void operator=(const viscosityModel&) = delete;
 
 
 public:
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.H b/src/transportModels/interfaceProperties/interfaceProperties.H
index 88d0f82361..09b1fac4e5 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.H
+++ b/src/transportModels/interfaceProperties/interfaceProperties.H
@@ -77,9 +77,11 @@ class interfaceProperties
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        interfaceProperties(const interfaceProperties&);
-        void operator=(const interfaceProperties&);
+        //- No copy construct
+        interfaceProperties(const interfaceProperties&) = delete;
+
+        //- No copy assignment
+        void operator=(const interfaceProperties&) = delete;
 
         //- Correction for the boundary condition on the unit normal nHat on
         //  walls to produce the correct contact dynamic angle
diff --git a/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
index 43a9a9096f..6202635497 100644
--- a/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
+++ b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
@@ -50,11 +50,11 @@ class regularWaveModel
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        regularWaveModel(const regularWaveModel&);
+        //- No copy construct
+        regularWaveModel(const regularWaveModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const regularWaveModel&);
+        //- No copy assignment
+        void operator=(const regularWaveModel&) = delete;
 
 
 protected:

From 2aaae74ee1ab4f0310d4c445312ea1e263c1f353 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 30 May 2018 12:11:13 +0200
Subject: [PATCH 08/13] STYLE: consistent ordering of "inline explicit" vs.
 "explicit inline"

- resolve in favour of "inline explicit", which had marginally more
  uses and provides consistent prefixing for inline methods.
---
 doc/codingStyleGuide.org                               |  6 +++---
 src/OpenFOAM/containers/Bits/PackedList/PackedList.H   |  6 +++---
 src/OpenFOAM/containers/Bits/bitSet/bitSet.H           |  8 ++++----
 .../containers/HashTables/HashPtrTable/HashPtrTable.H  |  2 +-
 .../containers/Lists/DynamicList/DynamicList.H         |  8 ++++----
 src/OpenFOAM/containers/Lists/FixedList/FixedList.H    | 10 +++++-----
 .../containers/Lists/IndirectList/IndirectList.H       |  6 +++---
 .../containers/Lists/SortableList/SortableList.H       |  2 +-
 .../containers/PtrLists/PtrDynList/PtrDynList.H        |  2 +-
 src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H     |  2 +-
 src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H   |  4 ++--
 src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H |  8 ++++----
 src/OpenFOAM/fields/Fields/Field/SubField.H            |  2 +-
 src/OpenFOAM/meshes/boundBox/boundBox.H                |  2 +-
 src/OpenFOAM/meshes/meshShapes/cell/cell.H             |  6 +++---
 src/OpenFOAM/meshes/meshShapes/face/face.H             | 10 +++++-----
 .../meshes/meshShapes/labelledTri/labelledTri.H        |  4 ++--
 src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H       |  2 +-
 src/OpenFOAM/meshes/meshShapes/triFace/triFace.H       |  4 ++--
 src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H        |  4 ++--
 src/OpenFOAM/primitives/hashes/SHA1/SHA1.H             |  4 ++--
 .../primitives/ranges/scalarRange/scalarRange.H        |  2 +-
 src/OpenFOAM/primitives/strings/lists/hashedWordList.H |  2 +-
 23 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index b8d1b0d98a..8714c3373a 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -86,7 +86,7 @@
         //  -  0: different
         //  - +1: identical
         //  - -1: same face, but different orientation
-        static inline int compare(const triFace&, const triFace&);
+        static int compare(const triFace&, const triFace&);
         #+end_src
         or
         #+begin_src C++
@@ -95,7 +95,7 @@
         //  -  0: different
         //  - +1: identical
         //  - -1: same face, but different orientation
-        static inline int compare(const triFace&, const triFace&);
+        static int compare(const triFace&, const triFace&);
         #+end_src
         *not*
         #+begin_src C++
@@ -103,7 +103,7 @@
         //  -  0: different
         //  - +1: identical
         //  - -1: same face, but different orientation
-        static inline int compare(const triFace&, const triFace&);
+        static int compare(const triFace&, const triFace&);
         #+end_src
       + List can be nested for example
         #+begin_src C++
diff --git a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
index 017d7f8e1b..700ffb6db5 100644
--- a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
@@ -229,7 +229,7 @@ public:
         inline constexpr PackedList() noexcept;
 
         //- Construct for given number of elements, initializes values to 0
-        explicit inline PackedList(const label numElem);
+        inline explicit PackedList(const label numElem);
 
         //- Construct for given number of elements, and the specified
         //- value for each element
@@ -245,10 +245,10 @@ public:
         inline PackedList(PackedList<Width>&& rhs);
 
         //- Construct from a list of values
-        explicit inline PackedList(const labelUList& values);
+        inline explicit PackedList(const labelUList& values);
 
         //- Construct from a list of values
-        explicit inline PackedList(const labelUIndList& values);
+        inline explicit PackedList(const labelUIndList& values);
 
         //- Clone
         inline autoPtr<PackedList<Width>> clone() const;
diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
index 38b0181a82..9f033ca297 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
@@ -142,7 +142,7 @@ public:
         explicit bitSet(Istream& is);
 
         //- Construct with given size, with all bits set to 0
-        explicit inline bitSet(const label n);
+        inline explicit bitSet(const label n);
 
         //- Construct with given size and value for all elements
         inline bitSet(const label n, const bool val);
@@ -154,7 +154,7 @@ public:
         inline bitSet(bitSet&& bitset);
 
         //- Construct from a list of bools
-        explicit inline bitSet(const UList<bool>& bools);
+        inline explicit bitSet(const UList<bool>& bools);
 
         //- Construct with given size with all bits set to 0,
         //- subsequently add specified locations as 1.
@@ -170,11 +170,11 @@ public:
 
         //- Construct with automatic sizing (filled with 0),
         //- and populate with specified locations as 1.
-        explicit inline bitSet(const labelUList& locations);
+        inline explicit bitSet(const labelUList& locations);
 
         //- Construct with automatic sizing (filled with 0),
         //- and populate with specified locations as 1.
-        explicit inline bitSet(const labelUIndList& locations);
+        inline explicit bitSet(const labelUIndList& locations);
 
         //- Clone
         inline autoPtr<bitSet> clone() const;
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index 9dedb2a0ff..990e8537c2 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -96,7 +96,7 @@ public:
         inline HashPtrTable();
 
         //- Construct given initial table capacity
-        explicit inline HashPtrTable(const label size);
+        inline explicit HashPtrTable(const label size);
 
         //- Construct from Istream using given Istream constructor class
         template<class INew>
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 4fa4a0fbb4..055fd7137c 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -118,7 +118,7 @@ public:
         inline constexpr DynamicList() noexcept;
 
         //- Construct an empty list with given reserve size.
-        explicit inline DynamicList(const label nElem);
+        inline explicit DynamicList(const label nElem);
 
         //- Construct with given size and value for all elements.
         inline DynamicList(const label nElem, const T& val);
@@ -135,7 +135,7 @@ public:
 
         //- Construct from UList. Size set to UList size.
         //  Also constructs from DynamicList with different sizing parameters.
-        explicit inline DynamicList(const UList<T>& lst);
+        inline explicit DynamicList(const UList<T>& lst);
 
         //- Construct from a FixedList
         template<unsigned FixedSize>
@@ -147,10 +147,10 @@ public:
         inline DynamicList(InputIterator begIter, InputIterator endIter);
 
         //- Construct from an initializer list. Size set to list size.
-        explicit inline DynamicList(std::initializer_list<T> lst);
+        inline explicit DynamicList(std::initializer_list<T> lst);
 
         //- Construct from UIndirectList. Size set to UIndirectList size.
-        explicit inline DynamicList(const UIndirectList<T>& lst);
+        inline explicit DynamicList(const UIndirectList<T>& lst);
 
         //- Move construct.
         inline DynamicList(DynamicList<T, SizeMin>&& lst);
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index b6f25a5021..bf954ce2bf 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -162,13 +162,13 @@ public:
         inline FixedList() = default;
 
         //- Construct and initialize all entries to given value
-        explicit inline FixedList(const T& val);
+        inline explicit FixedList(const T& val);
 
         //- Construct and initialize all entries to zero
-        explicit inline FixedList(const zero);
+        inline explicit FixedList(const zero);
 
         //- Copy construct from C-array
-        explicit inline FixedList(const T list[Size]);
+        inline explicit FixedList(const T list[Size]);
 
         //- Copy constructor
         inline FixedList(const FixedList<T, Size>& list);
@@ -186,10 +186,10 @@ public:
         inline FixedList(std::initializer_list<T> list);
 
         //- Construct from UList
-        explicit inline FixedList(const UList<T>& list);
+        inline explicit FixedList(const UList<T>& list);
 
         //- Construct from SLList
-        explicit inline FixedList(const SLList<T>& list);
+        inline explicit FixedList(const SLList<T>& list);
 
         //- Construct from Istream
         FixedList(Istream& is);
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index 6cb2dc576e..1944b7b1df 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -73,10 +73,10 @@ protected:
     // Constructors
 
         //- Copy construct from addressing array
-        explicit inline IndirectListAddressing(const labelUList& addr);
+        inline explicit IndirectListAddressing(const labelUList& addr);
 
         //- Move construct from addressing array
-        explicit inline IndirectListAddressing(List<label>&& addr);
+        inline explicit IndirectListAddressing(List<label>&& addr);
 
 
     // Member Functions
@@ -127,7 +127,7 @@ public:
 
         //- Copy construct addressing, shallow copy values list reference
         //- from UIndirectList
-        explicit inline IndirectList(const UIndirectList<T>& list);
+        inline explicit IndirectList(const UIndirectList<T>& list);
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
index c86656ffff..fe846ead30 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
@@ -69,7 +69,7 @@ public:
 
         //- Construct given size, sort later.
         //  The indices remain empty until the list is sorted
-        explicit inline SortableList(const label size);
+        inline explicit SortableList(const label size);
 
         //- Construct given size and initial value. Sort later on
         //  The indices remain empty until the list is sorted
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
index c89d4e9f5d..f2c653973b 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
@@ -75,7 +75,7 @@ public:
         inline constexpr PtrDynList() noexcept;
 
         //- Construct with given capacity.
-        explicit inline PtrDynList(const label len);
+        inline explicit PtrDynList(const label len);
 
         //- Copy construct using 'clone()' method on each element
         inline PtrDynList(const PtrDynList<T, SizeMin>& list);
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
index 7cdf1367a0..4ceda992a3 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
@@ -88,7 +88,7 @@ public:
         inline constexpr PtrList() noexcept;
 
         //- Construct with specified size, each element initialized to nullptr
-        explicit inline PtrList(const label len);
+        inline explicit PtrList(const label len);
 
         //- Copy construct using 'clone()' method on each element
         inline PtrList(const PtrList<T>& list);
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
index 212adf26e4..37bb8d97ec 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
@@ -110,7 +110,7 @@ public:
         inline constexpr UPtrList() noexcept;
 
         //- Construct with specified size, each element initialized to nullptr
-        explicit inline UPtrList(const label len);
+        inline explicit UPtrList(const label len);
 
         //- Copy construct (shallow copies addresses)
         inline UPtrList(const UPtrList<T>& list);
@@ -129,7 +129,7 @@ public:
         //- Construct from UList, taking the address of each list element
         //  The argument is non-const to reflect that the UPtrList can change
         //  the values of the original list.
-        explicit inline UPtrList(UList<T>& list);
+        inline explicit UPtrList(UList<T>& list);
 
 
     // Member functions
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index 18559ad7b6..0d4d7c2d45 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -103,7 +103,7 @@ public:
         inline constexpr DynamicField() noexcept;
 
         //- Construct empty field with given reserve size.
-        explicit inline DynamicField(const label len);
+        inline explicit DynamicField(const label len);
 
         //- Construct given size and initial value
         inline DynamicField(const label len, const T& val);
@@ -120,13 +120,13 @@ public:
 
         //- Copy construct from UList. Size set to UList size.
         //  Also constructs from DynamicField with different sizing parameters.
-        explicit inline DynamicField(const UList<T>& list);
+        inline explicit DynamicField(const UList<T>& list);
 
         //- Copy construct from UIndirectList
-        explicit inline DynamicField(const UIndirectList<T>& list);
+        inline explicit DynamicField(const UIndirectList<T>& list);
 
         //- Move construct from List contents
-        explicit inline DynamicField(List<T>&& content);
+        inline explicit DynamicField(List<T>&& content);
 
         //- Move construct from dynamic Field contents
         inline DynamicField(DynamicField<T, SizeMin>&& content);
diff --git a/src/OpenFOAM/fields/Fields/Field/SubField.H b/src/OpenFOAM/fields/Fields/Field/SubField.H
index 1a7fb9cb91..9509a65499 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubField.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubField.H
@@ -75,7 +75,7 @@ public:
         inline SubField(const SubList<Type>&);
 
         //- Construct from a UList\<Type\>, using the entire size
-        explicit inline SubField(const UList<Type>&);
+        inline explicit SubField(const UList<Type>&);
 
         //- Construct from a UList\<Type\> with a given size
         inline SubField
diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.H b/src/OpenFOAM/meshes/boundBox/boundBox.H
index a387e74ab7..abba73f881 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.H
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.H
@@ -85,7 +85,7 @@ public:
         inline boundBox();
 
         //- Construct a bounding box containing a single initial point
-        explicit inline boundBox(const point& pt);
+        inline explicit boundBox(const point& pt);
 
         //- Construct from components
         inline boundBox(const point& min, const point& max);
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.H b/src/OpenFOAM/meshes/meshShapes/cell/cell.H
index b1269443f3..6cba1b8866 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.H
@@ -67,13 +67,13 @@ public:
         inline cell();
 
         //- Construct given size, with invalid point labels (-1)
-        explicit inline cell(const label sz);
+        inline explicit cell(const label sz);
 
         //- Copy construct from list of labels
-        explicit inline cell(const labelUList& lst);
+        inline explicit cell(const labelUList& lst);
 
         //- Move construct from list of labels
-        explicit inline cell(labelList&& lst);
+        inline explicit cell(labelList&& lst);
 
         //- Construct from Istream
         inline cell(Istream& is);
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index 2691c30f09..61f2060f10 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -148,20 +148,20 @@ public:
         inline face();
 
         //- Construct given size, with invalid point labels (-1)
-        explicit inline face(const label sz);
+        inline explicit face(const label sz);
 
         //- Copy construct from list of labels
-        explicit inline face(const labelUList& lst);
+        inline explicit face(const labelUList& lst);
 
         //- Copy construct from list of labels
         template<unsigned Size>
-        explicit inline face(const FixedList<label, Size>& lst);
+        inline explicit face(const FixedList<label, Size>& lst);
 
         //- Copy construct from an initializer list of labels
-        explicit inline face(std::initializer_list<label> lst);
+        inline explicit face(std::initializer_list<label> lst);
 
         //- Move construct from list of labels
-        explicit inline face(labelList&& lst);
+        inline explicit face(labelList&& lst);
 
         //- Copy construct from triFace
         face(const triFace& f);
diff --git a/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTri.H b/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTri.H
index ad7b55ab6d..3f8bb16b68 100644
--- a/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTri.H
+++ b/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTri.H
@@ -97,10 +97,10 @@ public:
 
         //- Construct from a list of 3 or 4 labels.
         //  Default region is 0.
-        explicit inline labelledTri(const labelUList&);
+        inline explicit labelledTri(const labelUList&);
 
         //- Construct from an initializer list of 3 or 4 labels.
-        explicit inline labelledTri(std::initializer_list<label>);
+        inline explicit labelledTri(std::initializer_list<label>);
 
         //- Construct from Istream
         inline labelledTri(Istream&);
diff --git a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H
index 0208b85aca..c66712202c 100644
--- a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H
+++ b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H
@@ -81,7 +81,7 @@ public:
         inline tetCell(const FixedList<label, 4>& lst);
 
         //- Construct from an initializer list of four point labels
-        explicit inline tetCell(std::initializer_list<label> lst);
+        inline explicit tetCell(std::initializer_list<label> lst);
 
         //- Construct from Istream
         inline tetCell(Istream& is);
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index 442f1bc16d..68a41feebd 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -87,10 +87,10 @@ public:
         );
 
         //- Copy construct from a list of three point labels.
-        explicit inline triFace(const labelUList& lst);
+        inline explicit triFace(const labelUList& lst);
 
         //- Construct from an initializer list of three point labels
-        explicit inline triFace(std::initializer_list<label> lst);
+        inline explicit triFace(std::initializer_list<label> lst);
 
         //- Construct from Istream
         inline triFace(Istream& is);
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
index adcac28e03..7177cb020f 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
@@ -162,10 +162,10 @@ public:
         inline treeBoundBox();
 
         //- Construct from a boundBox
-        explicit inline treeBoundBox(const boundBox& bb);
+        inline explicit treeBoundBox(const boundBox& bb);
 
         //- Construct a bounding box containing a single initial point
-        explicit inline treeBoundBox(const point& pt);
+        inline explicit treeBoundBox(const point& pt);
 
         //- Construct from components
         inline treeBoundBox(const point& min, const point& max);
diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.H b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.H
index dfbd26b2cc..1af8c4a2fc 100644
--- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.H
+++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.H
@@ -108,10 +108,10 @@ public:
         inline SHA1();
 
         //- Construct null and append initial std::string
-        explicit inline SHA1(const std::string&);
+        inline explicit SHA1(const std::string&);
 
         //- Construct null and append initial string
-        explicit inline SHA1(const char*);
+        inline explicit SHA1(const char*);
 
     // Member Functions
 
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
index 415673ad99..8ab33c987c 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
@@ -92,7 +92,7 @@ public:
         inline scalarRange();
 
         //- Construct an exact value matcher
-        explicit inline scalarRange(const scalar value);
+        inline explicit scalarRange(const scalar value);
 
         //- Construct a range from min-value to max-value
         inline scalarRange(const scalar minVal, const scalar maxVal);
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
index c7a451942e..4d4089037e 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
@@ -92,7 +92,7 @@ public:
         //  This also handles a wordHashSet, which is derived from a HashTable.
         //  The result is similar to a HashTable::sortedToc.
         template<class AnyType, class AnyHash>
-        explicit inline hashedWordList
+        inline explicit hashedWordList
         (
             const HashTable<AnyType, word, AnyHash>& tbl
         );

From e43ae3f23fe15bcaec560ab0321ead62e0133942 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 30 May 2018 14:43:48 +0200
Subject: [PATCH 09/13] ENH: detect excess tokens when looking up a dictionary
 value (issues #762)

---
 src/OpenFOAM/db/dictionary/dictionary.C       | 25 +++++
 src/OpenFOAM/db/dictionary/dictionary.H       | 59 ++++++++---
 .../db/dictionary/dictionaryTemplates.C       | 99 ++++++++++++++++---
 3 files changed, 156 insertions(+), 27 deletions(-)

diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 9a96860e7f..6223da9e0f 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -44,6 +44,31 @@ bool Foam::dictionary::writeOptionalEntries
 );
 
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::dictionary::excessTokens
+(
+    OSstream& msg,
+    const word& keyword,
+    const ITstream& is
+) const
+{
+    const label nExcess = is.nRemainingTokens();
+
+    if (!nExcess)
+    {
+        return;
+    }
+
+    msg << "entry '" << keyword << "' has "
+        << nExcess << " excess tokens, near line: " << is.lineNumber() << nl
+        << "dictionary: " << name() << nl
+        << "stream:  ";
+    is.writeList(msg, 0);
+    msg << nl;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::dictionary::dictionary()
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index eca6635b1d..e5e6641b4d 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -100,7 +100,7 @@ SeeAlso
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
 class regExp;
 class dictionary;
 class SHA1Digest;
@@ -383,6 +383,15 @@ private:
         ) const;
 
 
+        //- Add report of excess tokens to the messageStream
+        void excessTokens
+        (
+            OSstream& msg,
+            const word& keyword,
+            const ITstream& is
+        ) const;
+
+
 public:
 
     // Declare name of the class and its debug switch
@@ -446,7 +455,7 @@ public:
 
     // Member functions
 
-      // Access
+    // Access
 
         //- Return the parent dictionary
         const dictionary& parent() const
@@ -470,7 +479,7 @@ public:
         tokenList tokens() const;
 
 
-      // Search and lookup
+    // Search and lookup
 
         //- Search dictionary for given keyword.
         //  Default search: non-recursive with patterns.
@@ -518,6 +527,20 @@ public:
             bool patternMatch
         ) const;
 
+        //- Find and return a T.
+        //- FatalError if not found, or if there are excess tokens.
+        //  Default search: non-recursive with patterns.
+        //
+        //  \param recursive search parent dictionaries
+        //  \param patternMatch use regular expressions
+        template<class T>
+        T get
+        (
+            const word& keyword,
+            bool recursive = false,
+            bool patternMatch = true
+        ) const;
+
         //- Find and return an entry data stream.
         //  Default search: non-recursive with patterns.
         //
@@ -530,11 +553,14 @@ public:
             bool patternMatch = true
         ) const;
 
-        //- Find and return a T. FatalError if not found.
+        //- Find and return a T.
+        //- FatalError if not found, or if there are excess tokens.
         //  Default search: non-recursive with patterns.
         //
         //  \param recursive search parent dictionaries
         //  \param patternMatch use regular expressions
+        //
+        //  \note same as get()
         template<class T>
         T lookupType
         (
@@ -544,6 +570,7 @@ public:
         ) const;
 
         //- Find and return a T, or return the given default value
+        //- FatalError if it is found and there are excess tokens.
         //  Default search: non-recursive with patterns.
         //
         //  \param recursive search parent dictionaries
@@ -557,8 +584,9 @@ public:
             bool patternMatch = true
         ) const;
 
-        //- Find and return a T, if not found return the default value
-        //  and add it to dictionary.
+        //- Find and return a T, or return the given default value
+        //- and add it to dictionary.
+        //- FatalError if it is found and there are excess tokens.
         //  Default search: non-recursive with patterns.
         //
         //  \param recursive search parent dictionaries
@@ -573,6 +601,7 @@ public:
         );
 
         //- Find an entry if present, and assign to T val.
+        //- FatalError if it is found and there are excess tokens.
         //  Default search: non-recursive with patterns.
         //
         //  \param val the value to read
@@ -663,7 +692,7 @@ public:
         List<keyType> keys(bool patterns = false) const;
 
 
-      // Editing
+    // Editing
 
         //- Substitute the given keyword (which is prefixed by '$')
         //  with the corresponding sub-dictionary entries
@@ -775,7 +804,7 @@ public:
         void transfer(dictionary& dict);
 
 
-      // Read
+    // Read
 
         //- Read dictionary from Istream
         bool read(Istream& is);
@@ -784,7 +813,7 @@ public:
         bool read(Istream& is, bool keepHeader);
 
 
-      // Write
+    // Write
 
         //- Write sub-dictionary with the keyword as its header
         void writeEntry(const keyType& keyword, Ostream& os) const;
@@ -798,7 +827,7 @@ public:
         void write(Ostream& os, const bool subDict=true) const;
 
 
-      // Searching
+    // Searching
 
         //- Search dictionary for given keyword
         //  Default search: non-recursive with patterns.
@@ -941,7 +970,7 @@ public:
         ) const;
 
         //- Find and return an entry pointer if present, or return a nullptr,
-        //- using any compatibility names it needed.
+        //- using any compatibility names if needed.
         //
         //  \param compat list of old compatibility keywords and the last
         //      OpenFOAM version for which they were used.
@@ -956,7 +985,7 @@ public:
         ) const;
 
         //- Find and return an entry if present otherwise error,
-        //- using any compatibility names it needed.
+        //- using any compatibility names if needed.
         //
         //  \param compat list of old compatibility keywords and the last
         //      OpenFOAM version for which they were used.
@@ -971,7 +1000,7 @@ public:
         ) const;
 
         //- Find and return an entry data stream,
-        //- using any compatibility names it needed.
+        //- using any compatibility names if needed.
         //  Default search: non-recursive with patterns.
         //
         //  \param compat list of old compatibility keywords and the last
@@ -987,7 +1016,7 @@ public:
         ) const;
 
         //- Find and return a T, or return the given default value
-        //- using any compatibility names it needed.
+        //- using any compatibility names if needed.
         //  Default search: non-recursive with patterns.
         //
         //  \param compat list of old compatibility keywords and the last
@@ -1005,7 +1034,7 @@ public:
         ) const;
 
         //- Find an entry if present, and assign to T val
-        //- using any compatibility names it needed.
+        //- using any compatibility names if needed.
         //  Default search: non-recursive with patterns.
         //
         //  \param compat list of old compatibility keywords and the last
diff --git a/src/OpenFOAM/db/dictionary/dictionaryTemplates.C b/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
index 833647b951..e2a5ab621d 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,7 +50,7 @@ Foam::entry* Foam::dictionary::set(const keyType& k, const T& v)
 
 
 template<class T>
-T Foam::dictionary::lookupType
+T Foam::dictionary::get
 (
     const word& keyword,
     bool recursive,
@@ -61,15 +61,36 @@ T Foam::dictionary::lookupType
 
     if (!finder.found())
     {
-        FatalIOErrorInFunction
-        (
-            *this
-        )   << "keyword " << keyword << " is undefined in dictionary "
+        FatalIOErrorInFunction(*this)
+            << "keyword " << keyword << " is undefined in dictionary "
             << name()
             << exit(FatalIOError);
     }
 
-    return pTraits<T>(finder.ptr()->stream());
+    T val;
+    ITstream& is = finder.ptr()->stream();
+    is >> val;
+
+    if (!is.eof())
+    {
+        auto err = FatalIOErrorInFunction(*this);
+        excessTokens(err, keyword, is);
+        err << exit(FatalIOError);
+    }
+
+    return val;
+}
+
+
+template<class T>
+T Foam::dictionary::lookupType
+(
+    const word& keyword,
+    bool recursive,
+    bool patternMatch
+) const
+{
+    return get<T>(keyword, recursive, patternMatch);
 }
 
 
@@ -86,7 +107,19 @@ T Foam::dictionary::lookupOrDefault
 
     if (finder.found())
     {
-        return pTraits<T>(finder.ptr()->stream());
+        T val;
+
+        ITstream& is = finder.ptr()->stream();
+        is >> val;
+
+        if (!is.eof())
+        {
+            auto err = FatalIOErrorInFunction(*this);
+            excessTokens(err, keyword, is);
+            err << exit(FatalIOError);
+        }
+
+        return val;
     }
 
     if (writeOptionalEntries)
@@ -114,7 +147,19 @@ T Foam::dictionary::lookupOrAddDefault
 
     if (finder.found())
     {
-        return pTraits<T>(finder.ptr()->stream());
+        T val;
+
+        ITstream& is = finder.ptr()->stream();
+        is >> val;
+
+        if (!is.eof())
+        {
+            auto err = FatalIOErrorInFunction(*this);
+            excessTokens(err, keyword, is);
+            err << exit(FatalIOError);
+        }
+
+        return val;
     }
 
     if (writeOptionalEntries)
@@ -143,7 +188,16 @@ bool Foam::dictionary::readIfPresent
 
     if (finder.found())
     {
-        finder.ptr()->stream() >> val;
+        ITstream& is = finder.ptr()->stream();
+        is >> val;
+
+        if (!is.eof())
+        {
+            auto err = FatalIOErrorInFunction(*this);
+            excessTokens(err, keyword, is);
+            err << exit(FatalIOError);
+        }
+
         return true;
     }
 
@@ -174,7 +228,19 @@ T Foam::dictionary::lookupOrDefaultCompat
 
     if (finder.found())
     {
-        return pTraits<T>(finder.ptr()->stream());
+        T val;
+
+        ITstream& is = finder.ptr()->stream();
+        is >> val;
+
+        if (!is.eof())
+        {
+            auto err = FatalIOErrorInFunction(*this);
+            excessTokens(err, keyword, is);
+            err << exit(FatalIOError);
+        }
+
+        return val;
     }
 
     if (writeOptionalEntries)
@@ -204,7 +270,16 @@ bool Foam::dictionary::readIfPresentCompat
 
     if (finder.found())
     {
-        finder.ptr()->stream() >> val;
+        ITstream& is = finder.ptr()->stream();
+        is >> val;
+
+        if (!is.eof())
+        {
+            auto err = FatalIOErrorInFunction(*this);
+            excessTokens(err, keyword, is);
+            err << exit(FatalIOError);
+        }
+
         return true;
     }
 

From 12553a2e4382b6d67a3609bb8d4267f6e87272bd Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 30 May 2018 14:45:12 +0200
Subject: [PATCH 10/13] COMP: include /usr/local in search for system
 headers/libraries

- this is consistent with compiler defaults, and helps Darwin users
---
 wmake/rules/General/CGAL    |  1 +
 wmake/scripts/have_boost    | 21 ++++++++++++++++-----
 wmake/scripts/have_cgal     | 21 ++++++++++++++++-----
 wmake/scripts/have_fftw     | 21 ++++++++++++++++-----
 wmake/scripts/have_kahip    | 21 ++++++++++++++++-----
 wmake/scripts/have_metis    | 21 ++++++++++++++++-----
 wmake/scripts/have_mgridgen | 21 ++++++++++++++++-----
 wmake/scripts/have_readline | 21 ++++++++++++++++-----
 wmake/scripts/have_scotch   | 26 +++++++++++++++++++++-----
 wmake/scripts/have_zoltan   | 21 ++++++++++++++++-----
 10 files changed, 150 insertions(+), 45 deletions(-)

diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index f6c32e1bb6..1606a2a8eb 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -3,6 +3,7 @@ CGAL_INC = \
     -I$(MPFR_ARCH_PATH)/include \
     -I$(BOOST_ARCH_PATH)/include \
     -I$(CGAL_ARCH_PATH)/include \
+    -I/usr/local/include \
     -I/usr/include
 
 CGAL_LIBS = \
diff --git a/wmake/scripts/have_boost b/wmake/scripts/have_boost
index c1cd39dbc1..e78d8ab228 100644
--- a/wmake/scripts/have_boost
+++ b/wmake/scripts/have_boost
@@ -82,12 +82,23 @@ have_boost()
         )
     elif isSystem "$BOOST_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
 
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi
diff --git a/wmake/scripts/have_cgal b/wmake/scripts/have_cgal
index 9c14b0caec..d641ccad25 100644
--- a/wmake/scripts/have_cgal
+++ b/wmake/scripts/have_cgal
@@ -82,12 +82,23 @@ have_cgal()
         )
     elif isSystem "$CGAL_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
 
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi
diff --git a/wmake/scripts/have_fftw b/wmake/scripts/have_fftw
index d3e87c5dab..1a899b0504 100644
--- a/wmake/scripts/have_fftw
+++ b/wmake/scripts/have_fftw
@@ -82,12 +82,23 @@ have_fftw()
         )
     elif isSystem "$FFTW_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
 
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi
diff --git a/wmake/scripts/have_kahip b/wmake/scripts/have_kahip
index 84e8cbde35..3dcf7c952b 100644
--- a/wmake/scripts/have_kahip
+++ b/wmake/scripts/have_kahip
@@ -90,12 +90,23 @@ have_kahip()
         )
     elif isSystem "$KAHIP_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
 
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi
diff --git a/wmake/scripts/have_metis b/wmake/scripts/have_metis
index ec5b185c04..4075286418 100644
--- a/wmake/scripts/have_metis
+++ b/wmake/scripts/have_metis
@@ -91,12 +91,23 @@ have_metis()
         )
     elif isSystem "$METIS_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
 
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi
diff --git a/wmake/scripts/have_mgridgen b/wmake/scripts/have_mgridgen
index 3c232c43fb..d8900a5662 100644
--- a/wmake/scripts/have_mgridgen
+++ b/wmake/scripts/have_mgridgen
@@ -91,12 +91,23 @@ have_mgridgen()
         )
     elif isSystem "$MGRIDGEN_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
 
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi
diff --git a/wmake/scripts/have_readline b/wmake/scripts/have_readline
index db85cdf0e8..9f9509e40f 100644
--- a/wmake/scripts/have_readline
+++ b/wmake/scripts/have_readline
@@ -61,12 +61,23 @@ have_readline()
     library="libreadline$extLibso"
 
     # System only?
-    header=$(findFirstFile /usr/include/$header)
+    header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
 
-    library=$(findFirstFile \
-        /usr/lib/$library \
-        /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-    )
+    case "$header" in
+    /usr/local/*)
+        library=$(findFirstFile \
+            /usr/local/lib/$library \
+            /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+        )
+        ;;
+
+    *)
+        library=$(findFirstFile \
+            /usr/lib/$library \
+            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+        )
+        ;;
+    esac
 
     # Header found?
     [ -n "$header" ] || {
diff --git a/wmake/scripts/have_scotch b/wmake/scripts/have_scotch
index bf613acf39..98c298c221 100644
--- a/wmake/scripts/have_scotch
+++ b/wmake/scripts/have_scotch
@@ -91,12 +91,28 @@ have_scotch()
         )
     elif isSystem "$SCOTCH_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header /usr/include/scotch/$header)
-
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+        header=$(findFirstFile \
+            /usr/local/include/$header \
+            /usr/local/include/scotch/$header \
+            /usr/include/$header \
+            /usr/include/scotch/$header \
         )
+
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi
diff --git a/wmake/scripts/have_zoltan b/wmake/scripts/have_zoltan
index bd02ac54a4..40d7a7d26c 100644
--- a/wmake/scripts/have_zoltan
+++ b/wmake/scripts/have_zoltan
@@ -90,12 +90,23 @@ have_zoltan()
         )
     elif isSystem "$ZOLTAN_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
 
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi

From 1c030f441da219afcdde52d8f4b1632616f6559f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 30 May 2018 16:18:20 +0200
Subject: [PATCH 11/13] STYLE: missing newline in correctPhi.H

---
 applications/solvers/multiphase/MPPICInterFoam/correctPhi.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/multiphase/MPPICInterFoam/correctPhi.H b/applications/solvers/multiphase/MPPICInterFoam/correctPhi.H
index e54630529a..9afcd58a66 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/correctPhi.H
+++ b/applications/solvers/multiphase/MPPICInterFoam/correctPhi.H
@@ -8,4 +8,4 @@ CorrectPhi
     pimple
 );
 
-#include "continuityErrs.H"
\ No newline at end of file
+#include "continuityErrs.H"

From cd8b67844f6c1df011a270c775d9b798ce597cad Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 31 May 2018 10:05:02 +0100
Subject: [PATCH 12/13] ENH: snappyHexMesh: Remove cells inside any limitRegion
 with level -1. Fixes #852.

---
 .../snappyHexMesh/snappyHexMeshDict           |   5 +-
 .../meshRefinement/meshRefinement.H           |  27 +++++
 .../meshRefinement/meshRefinementBaffles.C    | 111 +++++++++++++++++-
 .../snappyHexMeshDriver/snappyRefineDriver.C  |  27 +++++
 4 files changed, 165 insertions(+), 5 deletions(-)

diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index ef6b70f424..06070f01a9 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -314,8 +314,9 @@ castellatedMeshControls
     // refinement (from features, refinementSurfaces, refinementRegions)
     // in a given geometric region. The syntax is exactly the same as for the
     // refinementRegions; the cell level now specifies the upper limit
-    // for any cell. Note that it does not override the refinement constraints
-    // given by the nCellsBetweenLevels setting.
+    // for any cell. (a special setting is cell level -1 which will remove
+    // any cells inside the region). Note that it does not override the
+    // refinement constraints given by the nCellsBetweenLevels setting.
     limitRegions
     {
     }
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index 0c12143384..d3c068f72e 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
@@ -522,6 +522,16 @@ private:
                 labelList& neiPatch
             ) const;
 
+            autoPtr<mapPolyMesh> splitMesh
+            (
+                const label nBufferLayers,
+                const labelList& globalToMasterPatch,
+                const labelList& globalToSlavePatch,
+                labelList& cellRegion,
+                labelList& ownPatch,
+                labelList& neiPatch
+            );
+
             //- Repatches external face or creates baffle for internal face
             //  with user specified patches (might be different for both sides).
             //  Returns label of added face.
@@ -861,6 +871,12 @@ public:
                 return shells_;
             }
 
+            //- Reference to limit shells (regions)
+            const shellSurfaces& limitShells() const
+            {
+                return limitShells_;
+            }
+
             //- Reference to meshcutting engine
             const hexRef8& meshCutter() const
             {
@@ -1108,6 +1124,17 @@ public:
                 const pointField& locationsOutsideMesh
             );
 
+            //- Remove cells from limitRegions if level -1
+            autoPtr<mapPolyMesh> removeLimitShells
+            (
+                const label nBufferLayers,
+                const label nErodeCellZones,
+                const labelList& globalToMasterPatch,
+                const labelList& globalToSlavePatch,
+                const pointField& locationsInMesh,
+                const wordList& regionsInMesh
+            );
+
             //- Find boundary points that connect to more than one cell
             //  region and split them.
             autoPtr<mapPolyMesh> dupNonManifoldPoints(const localPointRegion&);
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index 9a560ff3dd..34ae55b76e 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,7 +48,7 @@ License
 #include "polyMeshAdder.H"
 #include "IOmanip.H"
 #include "refinementParameters.H"
-
+#include "shellSurfaces.H"
 #include "zeroGradientFvPatchFields.H"
 #include "volFields.H"
 
@@ -3874,7 +3874,28 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
         cellRegion
     );
 
+    return splitMesh
+    (
+        nBufferLayers,
+        globalToMasterPatch,
+        globalToSlavePatch,
+        cellRegion,
+        ownPatch,
+        neiPatch
+    );
+}
 
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
+(
+    const label nBufferLayers,
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch,
+
+    labelList& cellRegion,
+    labelList& ownPatch,
+    labelList& neiPatch
+)
+{
     // Walk out nBufferlayers from region boundary
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // (modifies cellRegion, ownPatch)
@@ -4049,7 +4070,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
     label nCellsToKeep = mesh_.nCells() - cellsToRemove.size();
     reduce(nCellsToKeep, sumOp<label>());
 
-    Info<< "Keeping all cells containing points " << locationsInMesh << endl
+    Info<< "Keeping all cells containing inside points" << endl
         << "Selected for keeping : " << nCellsToKeep << " cells." << endl;
 
 
@@ -4090,6 +4111,90 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
 }
 
 
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::removeLimitShells
+(
+    const label nBufferLayers,
+    const label nErodeCellZones,
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch,
+    const pointField& locationsInMesh,
+    const wordList& zonesInMesh
+)
+{
+    // Determine patches to put intersections into
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Swap neighbouring cell centres and cell level
+    labelList neiLevel(mesh_.nFaces()-mesh_.nInternalFaces());
+    pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
+    calcNeighbourData(neiLevel, neiCc);
+
+    // Find intersections with all unnamed(!) surfaces
+    labelList ownPatch, neiPatch;
+    getBafflePatches
+    (
+        nErodeCellZones,
+        globalToMasterPatch,
+
+        locationsInMesh,
+        zonesInMesh,
+
+        neiLevel,
+        neiCc,
+
+        ownPatch,
+        neiPatch
+    );
+
+
+    labelList cellRegion(mesh_.nCells(), 0);
+    // Find any cells inside a limit shell with minLevel -1
+    labelList levelShell;
+    limitShells_.findLevel
+    (
+        mesh_.cellCentres(),
+        labelList(mesh_.nCells(), -1),  // pick up only shells with -1
+        levelShell
+    );
+    forAll(levelShell, celli)
+    {
+        if (levelShell[celli] != -1)
+        {
+            // Mark cell region so it gets deletec
+            cellRegion[celli] = -1;
+        }
+    }
+
+    autoPtr<mapPolyMesh> mapPtr = splitMesh
+    (
+        nBufferLayers,
+        globalToMasterPatch,
+        globalToSlavePatch,
+        cellRegion,
+        ownPatch,
+        neiPatch
+    );
+
+    if (debug&meshRefinement::MESH)
+    {
+        const_cast<Time&>(mesh_.time())++;
+        Pout<< "Writing mesh after removing limitShells "
+            << " to time " << timeName() << endl;
+        write
+        (
+            debugType(debug),
+            writeType
+            (
+                writeLevel()
+              | WRITEMESH
+            ),
+            mesh_.time().path()/timeName()
+        );
+    }
+    return mapPtr;
+}
+
+
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints
 (
     const localPointRegion& regionSide
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index 1c35edf892..3eeeae6b43 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -1348,6 +1348,12 @@ void Foam::snappyRefineDriver::removeInsideCells
     const label nBufferLayers
 )
 {
+    // Skip if no limitRegion and zero bufferLayers
+    if (meshRefiner_.limitShells().shells().size() == 0 && nBufferLayers == 0)
+    {
+        return;
+    }
+
     Info<< nl
         << "Removing mesh beyond surface intersections" << nl
         << "------------------------------------------" << nl
@@ -1360,6 +1366,19 @@ void Foam::snappyRefineDriver::removeInsideCells
        const_cast<Time&>(mesh.time())++;
     }
 
+    // Remove any cells inside limitShells with level -1
+    meshRefiner_.removeLimitShells
+    (
+        nBufferLayers,
+        1,
+        globalToMasterPatch_,
+        globalToSlavePatch_,
+        refineParams.locationsInMesh(),
+        refineParams.zonesInMesh()
+    );
+
+    // Fix any additional (e.g. locationsOutsideMesh). Note: probably not
+    // nessecary.
     meshRefiner_.splitMesh
     (
         nBufferLayers,                  // nBufferLayers
@@ -2256,6 +2275,14 @@ void Foam::snappyRefineDriver::doRefine
         100    // maxIter
     );
 
+    // Remove any extra cells from limitRegion with level -1, without
+    // adding any buffer layer this time
+    removeInsideCells
+    (
+        refineParams,
+        0       // nBufferLayers
+    );
+
     // Refine any hexes with 5 or 6 faces refined to make smooth edges
     danglingCellRefine
     (

From b393c60d86fd89d905f0373d0e7ba53b00cf0327 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 31 May 2018 12:42:43 +0100
Subject: [PATCH 13/13] ENH: vtk: fix reading of inverted prisms. Fixes #850.

---
 .../vtk/read/vtkUnstructuredReader.C          | 246 ++++++++++++------
 1 file changed, 165 insertions(+), 81 deletions(-)

diff --git a/src/fileFormats/vtk/read/vtkUnstructuredReader.C b/src/fileFormats/vtk/read/vtkUnstructuredReader.C
index e0c34830f8..c20f627667 100644
--- a/src/fileFormats/vtk/read/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/read/vtkUnstructuredReader.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +29,7 @@ License
 #include "stringIOList.H"
 #include "cellModel.H"
 #include "vectorIOField.H"
+#include "triPointRef.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
@@ -300,6 +301,7 @@ void Foam::vtkUnstructuredReader::extractCells
                     )   << "Expected size 6 for VTK_WEDGE but found "
                         << nRead << exit(FatalIOError);
                 }
+                //- From mesh description in vtk documentation
                 prismPoints[0] = cellVertData[dataIndex++];
                 prismPoints[2] = cellVertData[dataIndex++];
                 prismPoints[1] = cellVertData[dataIndex++];
@@ -364,94 +366,106 @@ void Foam::vtkUnstructuredReader::readField
     const label size
 ) const
 {
-    switch (vtkDataTypeNames[dataType])
+    if (vtkDataTypeNames.found(dataType))
     {
-        case VTK_INT:
-        case VTK_UINT:
-        case VTK_LONG:
-        case VTK_ULONG:
-        case VTK_ID:
+        switch (vtkDataTypeNames[dataType])
         {
-            autoPtr<labelIOField> fieldVals
-            (
-                new labelIOField
-                (
-                    IOobject
-                    (
-                        arrayName,
-                        "",
-                        obj
-                    ),
-                    size
-                )
-            );
-            readBlock(inFile, fieldVals().size(), fieldVals());
-            regIOobject::store(fieldVals);
-        }
-        break;
-
-        case VTK_FLOAT:
-        case VTK_DOUBLE:
-        {
-            autoPtr<scalarIOField> fieldVals
-            (
-                new scalarIOField
-                (
-                    IOobject
-                    (
-                        arrayName,
-                        "",
-                        obj
-                    ),
-                    size
-                )
-            );
-            readBlock(inFile, fieldVals().size(), fieldVals());
-            regIOobject::store(fieldVals);
-        }
-        break;
-
-        case VTK_STRING:
-        {
-            if (debug)
+            case VTK_INT:
+            case VTK_UINT:
+            case VTK_LONG:
+            case VTK_ULONG:
+            case VTK_ID:
             {
-                Info<< "Reading strings:" << size << endl;
-            }
-            autoPtr<stringIOList> fieldVals
-            (
-                new stringIOList
+                autoPtr<labelIOField> fieldVals
                 (
-                    IOobject
+                    new labelIOField
                     (
-                        arrayName,
-                        "",
-                        obj
-                    ),
-                    size
-                )
-            );
-            // Consume current line.
-            inFile.getLine(fieldVals()[0]);
-
-            // Read without parsing
-            forAll(fieldVals(), i)
-            {
-                inFile.getLine(fieldVals()[i]);
+                        IOobject
+                        (
+                            arrayName,
+                            "",
+                            obj
+                        ),
+                        size
+                    )
+                );
+                readBlock(inFile, fieldVals().size(), fieldVals());
+                regIOobject::store(fieldVals);
             }
-            regIOobject::store(fieldVals);
-        }
-        break;
+            break;
 
-        default:
-        {
-            IOWarningInFunction(inFile)
-                << "Unhandled type " << vtkDataTypeNames[dataType] << endl
-                << "Skipping " << size
-                << " words." << endl;
-            scalarField fieldVals;
-            readBlock(inFile, size, fieldVals);
+            case VTK_FLOAT:
+            case VTK_DOUBLE:
+            {
+                autoPtr<scalarIOField> fieldVals
+                (
+                    new scalarIOField
+                    (
+                        IOobject
+                        (
+                            arrayName,
+                            "",
+                            obj
+                        ),
+                        size
+                    )
+                );
+                readBlock(inFile, fieldVals().size(), fieldVals());
+                regIOobject::store(fieldVals);
+            }
+            break;
+
+            case VTK_STRING:
+            {
+                if (debug)
+                {
+                    Info<< "Reading strings:" << size << endl;
+                }
+                autoPtr<stringIOList> fieldVals
+                (
+                    new stringIOList
+                    (
+                        IOobject
+                        (
+                            arrayName,
+                            "",
+                            obj
+                        ),
+                        size
+                    )
+                );
+                // Consume current line.
+                inFile.getLine(fieldVals()[0]);
+
+                // Read without parsing
+                forAll(fieldVals(), i)
+                {
+                    inFile.getLine(fieldVals()[i]);
+                }
+                regIOobject::store(fieldVals);
+            }
+            break;
+
+            default:
+            {
+                IOWarningInFunction(inFile)
+                    << "Unhandled type " << dataType << endl
+                    << "Skipping " << size
+                    << " words." << endl;
+                scalarField fieldVals;
+                readBlock(inFile, size, fieldVals);
+            }
+            break;
         }
-        break;
+    }
+    else
+    {
+        IOWarningInFunction(inFile)
+            << "Unhandled type " << dataType << endl
+            << "Skipping " << size
+            << " words." << endl;
+        scalarField fieldVals;
+        readBlock(inFile, size, fieldVals);
     }
 }
 
@@ -907,6 +921,29 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
                 }
             }
         }
+        else if (tag == "METADATA")
+        {
+            word infoTag(inFile);
+            if (infoTag != "INFORMATION")
+            {
+                FatalIOErrorInFunction(inFile)
+                    << "Unsupported tag "
+                    << infoTag << exit(FatalIOError);
+            }
+            label nInfo(readLabel(inFile));
+            if (debug)
+            {
+                Info<< "Consuming " << nInfo << " metadata information."
+                    << endl;
+            }
+            string line;
+            // Consume rest of line
+            inFile.getLine(line);
+            for (label i = 0; i < 2*nInfo; i++)
+            {
+                inFile.getLine(line);
+            }
+        }
         else
         {
             FatalIOErrorInFunction(inFile)
@@ -915,6 +952,53 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
         }
     }
 
+
+    // There is some problem with orientation of prisms - the point
+    // ordering seems to be different for some exports (e.g. of cgns)
+    {
+        const cellModel& prism = cellModel::ref(cellModel::PRISM);
+
+        label nSwapped = 0;
+
+        forAll(cells_, celli)
+        {
+            cellShape& shape = cells_[celli];
+            if (shape.model() == prism)
+            {
+                const triPointRef bottom
+                (
+                    points_[shape[0]],
+                    points_[shape[1]],
+                    points_[shape[2]]
+                );
+                const triPointRef top
+                (
+                    points_[shape[3]],
+                    points_[shape[4]],
+                    points_[shape[5]]
+                );
+
+                const point bottomCc(bottom.centre());
+                const vector bottomNormal(bottom.normal());
+                const point topCc(top.centre());
+
+                if (((topCc-bottomCc)&bottomNormal) < 0)
+                {
+                    // Flip top and bottom
+                    Swap(shape[0], shape[3]);
+                    Swap(shape[1], shape[4]);
+                    Swap(shape[2], shape[5]);
+                    nSwapped++;
+                }
+            }
+        }
+        if (nSwapped > 0)
+        {
+            WarningInFunction << "Swapped " << nSwapped << " prismatic cells"
+                << endl;
+        }
+    }
+
     if (debug)
     {
         Info<< "Read points:" << points_.size()