BUG: mappedPatch: do not use sampleMesh. Fixes #1951 .

The helper function sampleMesh returns a reference to the sampled mesh. This will fail if that mesh is on a different world.
ENH: Adding dynamic mesh to solidFoam and tutorial
2020-12-09 10:23:42 +00:00 · 2020-12-08 15:01:32 +00:00 · 2020-12-08 14:05:50 +00:00 · 2020-12-08 14:05:50 +00:00 · 2020-12-08 14:05:44 +00:00 · 2020-12-08 14:04:43 +00:00
12375 changed files with 2946123 additions and 196584 deletions
--- a/4
+++ b/4
@ -73,10 +73,10 @@ echo
 applications/Allwmake $targetType $*

 # Additional components/modules
-if [ "$FOAM_MODULE_PREFIX" = false ] || [ "$FOAM_MODULE_PREFIX" = none ]
+if [ "$FOAM_MODULE_PREFIX" = false ]
 then
    echo "========================================"
-    echo "OpenFOAM modules disabled (prefix=${FOAM_MODULE_PREFIX})"
+    echo "OpenFOAM modules disabled (prefix=false)"
    echo
 elif [ -d "$WM_PROJECT_DIR/modules" ]
 then
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -1,6 +1,6 @@
 # Contributors to OpenFOAM

-The following is a list of known contributors to OpenFOAM.
+The following is an list of known contributors to OpenFOAM.
 It is likely incomplete...

 ## Contributors (alphabetical by surname)
@ -24,7 +24,6 @@ It is likely incomplete...
 - Hrvoje Jasak
 - Alexander Kabat vel Job
 - Thilo Knacke
- Shannon Leakey
 - Tommaso Lucchini
 - Graham Macpherson
 - Alexey Matveichev
@ -34,7 +33,6 @@ It is likely incomplete...
 - Haakan Nilsson
 - Niklas Nordin
 - Mark Olesen
- Victor Olesen
 - Evangelos Papoutsis-Kiachagias
 - Juho Peltola
 - Johan Roenby
@ -51,7 +49,3 @@ It is likely incomplete...
 - Norbert Weber
 - Henry Weller
 - Niklas Wikstrom
- Guanyang Xue
- Thorsten Zirwes
-
-<!----------------------------------------------------------------------------->
--- a/META-INFO/README.md
+++ b/META-INFO/README.md
@ -3,9 +3,8 @@
 Meta-information is generally for OpenFOAM internal use only.

 The format, content and meaning may be changed at anytime without
-prior notice.
-If any of these are changed, these are some of places that will need
-to be updated accordingly:
+notice. If any of these are changed, these are some of places that
+will need to be updated accordingly:

  - bin/foamEtcFile
  - bin/tools/foamConfigurePaths
@ -39,7 +38,7 @@ Format: `date +%y%m`

 - 4-digit year-month (YYMM) integer corresponding to the major
  release or in unusual cases an intermediate release.
-  Example, `2106` for the June-2021 release.
+  Example, `1712` for the Dec-2017 release.


 #### patch
@ -79,9 +78,9 @@ the saved information needs synchronization. The command

 ### Notes

-The saved information is split into two separate files.
-The `api-info` file contains more permanent information,
-whereas the `build-info` is more transient in nature.
+The saved information is split into two separate files. The `api-info`
+contains more permanent information, whereas the `build-info` is more
+transient in nature.

 ----
-2021-06-09
+2020-06-23
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@ -1,2 +1,2 @@
-api=2106
-patch=0
+api=2011
+patch=201012
--- a/README.md
+++ b/README.md
@ -11,7 +11,7 @@ individual and group contributors, integrations
 [governance guided activities](https://www.openfoam.com/governance/).


-## License
+## Copyright

 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
@ -27,11 +27,10 @@ may redistribute files.
 OpenCFD Ltd grants use of its OpenFOAM trademark by Third Parties on a
 licence basis. ESI Group and OpenFOAM Foundation Ltd are currently
 permitted to use the Name and agreed Domain Name. For information on
-trademark use, please refer to the
-[trademark policy guidelines][link trademark].
+trademark use, please refer to the [trademark policy guidelines](http://www.openfoam.com/legal/trademark-policy.php).

 Please [contact OpenCFD](http://www.openfoam.com/contact) if you have
-any questions about the use of the OpenFOAM trademark.
+any questions on the use of the OpenFOAM trademark.

 Violations of the Trademark are monitored, and will be duly prosecuted.

@ -40,9 +39,9 @@ Violations of the Trademark are monitored, and will be duly prosecuted.

 If OpenFOAM has already been compiled on your system, simply source
 the appropriate `etc/bashrc` or `etc/cshrc` file and get started.
-For example, for the OpenFOAM-v2106 version:
+For example, for the OpenFOAM-v1912 version:
 ```
-source /installation/path/OpenFOAM-v2106/etc/bashrc
+source /installation/path/OpenFOAM-v1912/etc/bashrc
 ```

 ## Compiling OpenFOAM
@ -56,11 +55,6 @@ guides:
 | [ThirdParty][repo third] | [readme][link third-readme] | [system requirements][link third-require] | [build][link third-build] |


-If you need to modify the versions or locations of ThirdParty
-software, please read how the
-[OpenFOAM configuration][wiki-config] is structured.
-
-
 ## How do I know which version I am currently using?

 The value of the `$WM_PROJECT_DIR` or even `$WM_PROJECT_VERSION` are
@ -69,19 +63,19 @@ not guaranteed to have any correspondence to the OpenFOAM release
 information is embedded into each application. For example, as
 displayed from `blockMesh -help`:
 ```
-Using: OpenFOAM-com (2012) - visit www.openfoam.com
-Build: b830beb5ea-20210429 (patch=210414)
+Using: OpenFOAM-v1812.local (1812) - visit www.openfoam.com
+Build: 65d6551ff7-20190530 (patch=190531)
 Arch:  LSB;label=32;scalar=64
 ```
 This output contains all of the more interesting information that we need:

 | item                  | value         |
 |-----------------------|---------------|
-| version               | com  (eg, local development branch) |
-| api                   | 2012          |
-| commit                | b830beb5ea    |
-| author date           | 20210429      |
-| patch-level           | (20)210414    |
+| version               | v1812.local   |
+| api                   | 1812          |
+| commit                | 65d6551ff7    |
+| author date           | 20190530      |
+| patch-level           | (20)190531    |
 | label/scalar size     | 32/64 bits    |

 The Arch information may also include the `solveScalar` size
@ -96,19 +90,19 @@ when OpenFOAM has not yet been compiled:
 ```
 $ wmake -build-info
 make
-    api = 2012
-    patch = 210414
+    api = 1812
+    patch = 190531
    branch = master
-    build = 308af39136-20210426
+    build = 65d6551ff7-20190530
 ```
 Similar information is available with `foamEtcFile`, using the
 `-show-api` or `-show-patch` options. For example,
 ```
 $ foamEtcFile -show-api
-2012
+1812

 $ foamEtcFile -show-patch
-210414
+190531
 ```
 This output will generally be the easiest to parse for scripts.
 The `$FOAM_API` convenience environment variable may not reflect the
@ -127,8 +121,8 @@ These 3rd-party sources are normally located in a directory parallel
 to the OpenFOAM directory. For example,
 ```
 /path/parent
-|-- OpenFOAM-v2106
-\-- ThirdParty-v2106
+|-- OpenFOAM-v1912
+\-- ThirdParty-v1912
 ```
 There are, however, many cases where this simple convention is inadequate:

@ -136,7 +130,7 @@ There are, however, many cases where this simple convention is inadequate:
  operating system or cluster installation provides it)

 * When we have changed the OpenFOAM directory name to some arbitrary
-  directory name, e.g. openfoam-sandbox2106, etc..
+  directory name, e.g. openfoam-sandbox1912, etc..

 * When we would like any additional 3rd party software to be located
  inside of the OpenFOAM directory to ensure that the installation is
@ -156,14 +150,17 @@ when locating the ThirdParty directory with the following precedence:
 2. PREFIX/ThirdParty-VERSION
   * this corresponds to the traditional approach
 3. PREFIX/ThirdParty-vAPI
-   * allows for an updated value of VERSION, *eg*, `v2106-myCustom`,
+   * allows for an updated value of VERSION, *eg*, `v1912-myCustom`,
     without requiring a renamed ThirdParty. The API value would still
-     be `2106` and the original `ThirdParty-v2106/` would be found.
+     be `1912` and the original `ThirdParty-v1912/` would be found.
 4. PREFIX/ThirdParty-API
-   * same as the previous example, but using an unadorned API value.
+   * this is the same as the previous example, but using an unadorned
+     API value. This also makes sense if the chosen version name also
+     uses the unadorned API value in its naming, *eg*,
+     `1912-patch190131`, `1912.19W03`
 5. PREFIX/ThirdParty-common
-   * permits maximum reuse for various versions, for experienced
-     users who are aware of potential version incompatibilities
+   * permits maximum reuse for various versions, for experienced user
+     who are aware of potential version incompatibilities

 If none of these directories are found to be suitable, it reverts to
 using PROJECT/ThirdParty as a dummy location (even if the directory
@ -187,21 +184,18 @@ ThirdParty directory will contain either an `Allwmake` file or a

 <!-- OpenFOAM -->

-[link trademark]: https://www.openfoam.com/opencfd-limited-trade-mark-policy
-
 [repo openfoam]: https://develop.openfoam.com/Development/openfoam/
 [repo third]: https://develop.openfoam.com/Development/ThirdParty-common/

 [link openfoam-readme]: https://develop.openfoam.com/Development/openfoam/blob/develop/README.md
 [link openfoam-issues]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/BuildIssues.md
+[link openfoam-config]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Config.md
 [link openfoam-build]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Build.md
 [link openfoam-require]: https://develop.openfoam.com/Development/openfoam/blob/develop/doc/Requirements.md
 [link third-readme]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/README.md
 [link third-build]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/BUILD.md
 [link third-require]: https://develop.openfoam.com/Development/ThirdParty-common/blob/develop/Requirements.md

-[wiki-config]: https://develop.openfoam.com/Development/openfoam/-/wikis/configuring
-

 ## Useful Links

@ -209,8 +203,8 @@ ThirdParty directory will contain either an `Allwmake` file or a
 - [Documentation](http://www.openfoam.com/documentation)
 - [Reporting bugs/issues/feature requests](http://www.openfoam.com/code/bug-reporting.php)
 - [Issue tracker](https://develop.openfoam.com/Development/openfoam/-/issues)
- [Code wiki](https://develop.openfoam.com/Development/openfoam/-/wikis/) and [General wiki](http://wiki.openfoam.com/)
- [Governance](http://www.openfoam.com/governance/), [Governance Projects](https://www.openfoam.com/governance/projects)
+- [Code wiki](https://develop.openfoam.com/Development/openfoam/-/wikis/) and [general wiki](http://wiki.openfoam.com/)
+- [Community](http://www.openfoam.com/community/), [Governance](http://www.openfoam.com/governance/)
 - [Contacting OpenCFD](http://www.openfoam.com/contact/)

-Copyright 2016-2021 OpenCFD Ltd
+Copyright 2016-2020 OpenCFD Ltd
--- a/applications/solvers/acoustic/acousticFoam/Make/files
+++ b/applications/solvers/acoustic/acousticFoam/Make/files
@ -1,3 +0,0 @@
-acousticFoam.C
-
-EXE = $(FOAM_APPBIN)/acousticFoam
--- a/applications/solvers/acoustic/acousticFoam/Make/options
+++ b/applications/solvers/acoustic/acousticFoam/Make/options
@ -1,14 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOption/lnInclude \
-    -I$(LIB_SRC)/regionFaModels/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -lfvOptions \
-    -lmeshTools \
-    -lsampling \
-    -lregionFaModels
--- a/applications/solvers/acoustic/acousticFoam/acousticFoam.C
+++ b/applications/solvers/acoustic/acousticFoam/acousticFoam.C
@ -1,99 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
-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
-   acousticFoam
-
-Group
-    grpAcousticSolvers
-
-Description
-    Acoustic solver solving the acoustic pressure wave equation.
-
-    \f[
-        \ddt2{pa} - c^2 \laplacian{pa} = 0
-    \f]
-
-    where
-    \vartable
-        c       | Sound speed
-        pa      | Acoustic pressure
-    \endvartable
-
-SourceFiles
-    acousticFoam.C
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "fvOptions.H"
-#include "pimpleControl.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    argList::addNote
-    (
-        "Acoustic solver solving the acoustic pressure wave equation."
-    );
-
-    #include "postProcess.H"
-
-    #include "addCheckCaseOptions.H"
-    #include "setRootCaseLists.H"
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "createControl.H"
-    #include "createRegionControls.H"
-
-    #include "readTransportProperties.H"
-    #include "createFields.H"
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.run())
-    {
-        ++runTime;
-
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        while (pimple.correct())
-        {
-            #include "paEqn.H"
-        }
-
-        runTime.write();
-
-        runTime.printExecutionTime(Info);
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
--- a/applications/solvers/acoustic/acousticFoam/createFields.H
+++ b/applications/solvers/acoustic/acousticFoam/createFields.H
@ -1,15 +0,0 @@
-
-Info << "\nReading pa" << endl;
-
-volScalarField pa
-(
-    IOobject
-    (
-        "pa",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
--- a/applications/solvers/acoustic/acousticFoam/createRegionControls.H
+++ b/applications/solvers/acoustic/acousticFoam/createRegionControls.H
@ -1,8 +0,0 @@
-fvSolution solutionDict(runTime);
-
-const dictionary& pimpleDict = solutionDict.subDict("PIMPLE");
-
-bool solvePrimaryRegion
-(
-    pimpleDict.getOrDefault("solvePrimaryRegion", true)
-);
--- a/applications/solvers/acoustic/acousticFoam/paEqn.H
+++ b/applications/solvers/acoustic/acousticFoam/paEqn.H
@ -1,15 +0,0 @@
-
-fvScalarMatrix paEqn
-(
-    fvm::d2dt2(pa) - sqr(c0)*fvc::laplacian(pa)
-);
-
-if (solvePrimaryRegion)
-{
-    paEqn.relax();
-    paEqn.solve();
-}
-else
-{
-    pa.correctBoundaryConditions();
-}
--- a/applications/solvers/acoustic/acousticFoam/readTransportProperties.H
+++ b/applications/solvers/acoustic/acousticFoam/readTransportProperties.H
@ -1,23 +0,0 @@
-Info<< "\nReading transportProperties" << endl;
-
-IOdictionary transportProperties
-(
-    IOobject
-    (
-        "transportProperties",
-        runTime.constant(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE
-    )
-);
-
-dimensionedScalar c0("c0", dimVelocity, transportProperties);
-
-dimensionedScalar rho("rho", dimDensity, transportProperties);
-
-scalar MaxCo =
-    max(mesh.surfaceInterpolation::deltaCoeffs()*c0).value()
-   *runTime.deltaT().value();
-
-Info<< "Max acoustic Courant Number = " << MaxCo << endl;
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@ -160,7 +160,7 @@ int main(int argc, char *argv[])
        runTime.printExecutionTime(Info);
    }

-    Info<< "End\n";
+    Info<< "\n end\n";

    return 0;
 }
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@ -207,7 +207,7 @@ int main(int argc, char *argv[])
        runTime.printExecutionTime(Info);
    }

-    Info<< "End\n";
+    Info<< "\n end\n";

    return 0;
 }
--- a/applications/solvers/combustion/chemFoam/Make/options
+++ b/applications/solvers/combustion/chemFoam/Make/options
@ -6,13 +6,11 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude

 EXE_LIBS = \
    -lfiniteVolume \
    -lmeshTools \
    -lfluidThermophysicalModels \
    -lreactionThermophysicalModels \
-    -lchemistryModel \
-    -lthermophysicalProperties
+    -lchemistryModel
--- a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createUpdatedDynamicFvMesh.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createUpdatedDynamicFvMesh.H
@ -7,7 +7,7 @@
        (
            IOobject
            (
-                polyMesh::defaultRegion,
+                dynamicFvMesh::defaultRegion,
                runTime.timeName(),
                runTime,
                IOobject::MUST_READ
--- a/applications/solvers/electromagnetics/magneticFoam/magnet.H
+++ b/applications/solvers/electromagnetics/magneticFoam/magnet.H
@ -44,7 +44,11 @@ SourceFiles
 namespace Foam
 {

-// Forward Declarations
+// Forward declaration of classes
+class Istream;
+class Ostream;
+
+// Forward declaration of friend functions and operators
 class magnet;
 Istream& operator>>(Istream&, magnet&);
 Ostream& operator<<(Ostream&, const magnet&);
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
@ -14,9 +14,7 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionFaModels/lnInclude
+    -I$(LIB_SRC)/regionModels/regionModel/lnInclude

 EXE_LIBS = \
    -lfiniteVolume \
@ -30,8 +28,4 @@ EXE_LIBS = \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
    -lradiationModels \
-    -lfvOptions \
-    -lfaOptions \
-    -lregionModels \
-    -lsampling \
-    -lregionFaModels
+    -lregionModels
--- a/applications/solvers/heatTransfer/solidFoam/Make/options
+++ b/applications/solvers/heatTransfer/solidFoam/Make/options
@ -1,4 +1,5 @@
 EXE_INC = \
+    -DFULLDEBUG -g -O0 \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
@ -19,6 +20,5 @@ EXE_LIBS = \
    -ltopoChangerFvMesh \
    -lcompressibleTransportModels \
    -lfluidThermophysicalModels \
-    -lsolidThermo \
    -lradiationModels \
    -lspecie
--- a/applications/solvers/heatTransfer/solidFoam/createFieldRefs.H
+++ b/applications/solvers/heatTransfer/solidFoam/createFieldRefs.H
@ -1,4 +0,0 @@
-const volScalarField& rho = trho();
-volScalarField& h = thermo.he();
-const volScalarField& betav = *betavPtr;
-
--- a/applications/solvers/heatTransfer/solidFoam/createFields.H
+++ b/applications/solvers/heatTransfer/solidFoam/createFields.H
@ -4,6 +4,13 @@ autoPtr<solidThermo> pThermo(solidThermo::New(mesh));
 solidThermo& thermo = pThermo();

 tmp<volScalarField> trho = thermo.rho();
+const volScalarField& rho = trho();
+
+tmp<volScalarField> tcp = thermo.Cp();
+const volScalarField& cp = tcp();
+
+volScalarField& p = thermo.p();
+volScalarField& h = thermo.he();

 autoPtr<coordinateSystem> coordinatesPtr;
 autoPtr<volSymmTensorField> taniAlpha;
@ -89,6 +96,7 @@ else
        )
    );
 }
+const volScalarField& betav = *betavPtr;

 #include "createRadiationModel.H"
 #include "createFvOptions.H"
--- a/applications/solvers/heatTransfer/solidFoam/solidFoam.C
+++ b/applications/solvers/heatTransfer/solidFoam/solidFoam.C
@ -60,7 +60,6 @@ int main(int argc, char *argv[])
    #include "createTime.H"
    #include "createDynamicFvMesh.H"
    #include "createFields.H"
-    #include "createFieldRefs.H"

    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createUpdatedDynamicFvMesh.H
+++ b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createUpdatedDynamicFvMesh.H
@ -7,7 +7,7 @@
        (
            IOobject
            (
-                polyMesh::defaultRegion,
+                dynamicFvMesh::defaultRegion,
                runTime.timeName(),
                runTime,
                IOobject::MUST_READ
--- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
@ -6,7 +6,6 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -37,13 +36,13 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "singlePhaseTransportModel.H"
-#include "DPMIncompressibleTurbulenceModel.H"
+#include "PhaseIncompressibleTurbulenceModel.H"
 #include "pimpleControl.H"
 #include "CorrectPhi.H"

 #ifdef MPPIC
-    #include "basicKinematicCloud.H"
-    #define basicKinematicTypeCloud basicKinematicCloud
+    #include "basicKinematicMPPICCloud.H"
+    #define basicKinematicTypeCloud basicKinematicMPPICCloud
 #else
    #include "basicKinematicCollidingCloud.H"
    #define basicKinematicTypeCloud basicKinematicCollidingCloud
@ -111,6 +110,7 @@ int main(int argc, char *argv[])
        continuousPhaseTransport.correct();
        muc = rhoc*continuousPhaseTransport.nu();

+        Info<< "Evolving " << kinematicCloud.name() << endl;
        kinematicCloud.evolve();

        // Update continuous phase volume fraction field
--- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
    -I.. \
    -I../.. \
-    -I../../DPMTurbulenceModels \
+    -I../DPMTurbulenceModels/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options
@ -1,6 +1,6 @@
 EXE_INC = \
    -I.. \
-    -I../DPMTurbulenceModels \
+    -I../DPMTurbulenceModels/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@ -6,7 +6,6 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -39,12 +38,12 @@ Description

 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "DPMIncompressibleTurbulenceModel.H"
+#include "PhaseIncompressibleTurbulenceModel.H"
 #include "pimpleControl.H"

 #ifdef MPPIC
-    #include "basicKinematicCloud.H"
-    #define basicKinematicTypeCloud basicKinematicCloud
+    #include "basicKinematicMPPICCloud.H"
+    #define basicKinematicTypeCloud basicKinematicMPPICCloud
 #else
    #include "basicKinematicCollidingCloud.H"
    #define basicKinematicTypeCloud basicKinematicCollidingCloud
@ -118,12 +117,6 @@ int main(int argc, char *argv[])
        cloudVolSUSu.correctBoundaryConditions();
        cloudSU.source() = Zero;

-//         cloudVolSUSu.primitiveFieldRef() =
-//             (cloudSU.diag()*Uc() - cloudSU.source())/mesh.V();
-//         cloudVolSUSu.correctBoundaryConditions();
-//         cloudSU.source() = cloudSU.diag()*Uc();
-
-
        // --- Pressure-velocity PIMPLE corrector loop
        while (pimple.loop())
        {
--- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMIncompressibleTurbulenceModel.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMIncompressibleTurbulenceModel.C
@ -1,186 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
-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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "DPMIncompressibleTurbulenceModel.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class TransportModel>
-Foam::DPMIncompressibleTurbulenceModel<TransportModel>::
-DPMIncompressibleTurbulenceModel
-(
-    const word& type,
-    const volScalarField& alpha,
-    const geometricOneField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& alphaRhoPhi,
-    const surfaceScalarField& phi,
-    const TransportModel& transportModel,
-    const word& propertiesName
-)
-:
-    TurbulenceModel
-    <
-        volScalarField,
-        geometricOneField,
-        incompressibleTurbulenceModel,
-        TransportModel
-    >
-    (
-        alpha,
-        rho,
-        U,
-        alphaRhoPhi,
-        phi,
-        transportModel,
-        propertiesName
-    )
-{}
-
-
-// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-
-template<class TransportModel>
-Foam::autoPtr<Foam::DPMIncompressibleTurbulenceModel<TransportModel>>
-Foam::DPMIncompressibleTurbulenceModel<TransportModel>::New
-(
-    const volScalarField& alpha,
-    const volVectorField& U,
-    const surfaceScalarField& alphaRhoPhi,
-    const surfaceScalarField& phi,
-    const TransportModel& transportModel,
-    const word& propertiesName
-)
-{
-    return autoPtr<DPMIncompressibleTurbulenceModel>
-    (
-        static_cast<DPMIncompressibleTurbulenceModel*>(
-        TurbulenceModel
-        <
-            volScalarField,
-            geometricOneField,
-            incompressibleTurbulenceModel,
-            TransportModel
-        >::New
-        (
-            alpha,
-            geometricOneField(),
-            U,
-            alphaRhoPhi,
-            phi,
-            transportModel,
-            propertiesName
-        ).ptr())
-    );
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class TransportModel>
-Foam::tmp<Foam::volScalarField>
-Foam::DPMIncompressibleTurbulenceModel<TransportModel>::pPrime() const
-{
-    return tmp<volScalarField>::New
-    (
-        IOobject
-        (
-            IOobject::groupName("pPrime", this->alphaRhoPhi_.group()),
-            this->runTime_.timeName(),
-            this->mesh_,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        this->mesh_,
-        dimensionedScalar(dimPressure, Zero)
-    );
-}
-
-
-template<class TransportModel>
-Foam::tmp<Foam::surfaceScalarField>
-Foam::DPMIncompressibleTurbulenceModel<TransportModel>::pPrimef() const
-{
-    return tmp<surfaceScalarField>::New
-    (
-        IOobject
-        (
-            IOobject::groupName("pPrimef", this->alphaRhoPhi_.group()),
-            this->runTime_.timeName(),
-            this->mesh_,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        this->mesh_,
-        dimensionedScalar(dimPressure, Zero)
-    );
-}
-
-
-template<class TransportModel>
-Foam::tmp<Foam::volSymmTensorField>
-Foam::DPMIncompressibleTurbulenceModel<TransportModel>::devReff() const
-{
-    return devRhoReff();
-}
-
-
-template<class TransportModel>
-Foam::tmp<Foam::fvVectorMatrix>
-Foam::DPMIncompressibleTurbulenceModel<TransportModel>::divDevReff
-(
-    volVectorField& U
-) const
-{
-    return divDevRhoReff(U);
-}
-
-
-template<class TransportModel>
-Foam::tmp<Foam::volSymmTensorField>
-Foam::DPMIncompressibleTurbulenceModel<TransportModel>::devRhoReff() const
-{
-    NotImplemented;
-
-    return devReff();
-}
-
-
-template<class TransportModel>
-Foam::tmp<Foam::fvVectorMatrix>
-Foam::DPMIncompressibleTurbulenceModel<TransportModel>::divDevRhoReff
-(
-    volVectorField& U
-) const
-{
-    NotImplemented;
-
-    return divDevReff(U);
-}
-
-
-// ************************************************************************* //
--- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMIncompressibleTurbulenceModel.H
+++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMIncompressibleTurbulenceModel.H
@ -1,144 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
-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/>.
-
-Class
-    Foam::DPMIncompressibleTurbulenceModel
-
-Description
-    Templated abstract base class for volumen occupancy incompressible
-    turbulence models.
-
-SourceFiles
-    DPMIncompressibleTurbulenceModel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef DPMIncompressibleTurbulenceModel_H
-#define DPMIncompressibleTurbulenceModel_H
-
-#include "TurbulenceModel.H"
-#include "incompressibleTurbulenceModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-               Class DPMIncompressibleTurbulenceModel Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class TransportModel>
-class DPMIncompressibleTurbulenceModel
-:
-    public TurbulenceModel
-    <
-        volScalarField,
-        geometricOneField,
-        incompressibleTurbulenceModel,
-        TransportModel
-    >
-{
-
-public:
-
-    typedef volScalarField alphaField;
-    typedef geometricOneField rhoField;
-    typedef TransportModel transportModel;
-
-
-    // Constructors
-
-        //- Construct
-        DPMIncompressibleTurbulenceModel
-        (
-            const word& type,
-            const alphaField& alpha,
-            const geometricOneField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& alphaRhoPhi,
-            const surfaceScalarField& phi,
-            const TransportModel& transportModel,
-            const word& propertiesName
-        );
-
-
-    // Selectors
-
-        //- Return a reference to the selected turbulence model
-        static autoPtr<DPMIncompressibleTurbulenceModel> New
-        (
-            const alphaField& alpha,
-            const volVectorField& U,
-            const surfaceScalarField& alphaRhoPhi,
-            const surfaceScalarField& phi,
-            const TransportModel& transportModel,
-            const word& propertiesName = turbulenceModel::propertiesName
-        );
-
-
-    //- Destructor
-    virtual ~DPMIncompressibleTurbulenceModel() = default;
-
-
-    // Member Functions
-
-        //- Return the phase-pressure'
-        // (derivative of phase-pressure w.r.t. phase-fraction)
-        virtual tmp<volScalarField> pPrime() const;
-
-        //- Return the face-phase-pressure'
-        // (derivative of phase-pressure w.r.t. phase-fraction)
-        virtual tmp<surfaceScalarField> pPrimef() const;
-
-        //- Return the effective stress tensor
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the effective stress tensor
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "DPMIncompressibleTurbulenceModel.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
--- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2013-2016 OpenFOAM Foundation
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -25,7 +25,7 @@ License

 \*---------------------------------------------------------------------------*/

-#include "DPMIncompressibleTurbulenceModel.H"
+#include "PhaseIncompressibleTurbulenceModel.H"
 #include "singlePhaseTransportModel.H"
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
@ -41,7 +41,7 @@ defineTurbulenceModelTypes
    volScalarField,
    geometricOneField,
    incompressibleTurbulenceModel,
-    DPMIncompressibleTurbulenceModel,
+    PhaseIncompressibleTurbulenceModel,
    singlePhaseTransportModel
 );

@ -50,21 +50,21 @@ makeBaseTurbulenceModel
    volScalarField,
    geometricOneField,
    incompressibleTurbulenceModel,
-    DPMIncompressibleTurbulenceModel,
+    PhaseIncompressibleTurbulenceModel,
    singlePhaseTransportModel
 );

 #define makeLaminarModel(Type)                                                 \
    makeTemplatedTurbulenceModel                                               \
-    (singlePhaseTransportModelDPMIncompressibleTurbulenceModel, laminar, Type)
+    (singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, laminar, Type)

 #define makeRASModel(Type)                                                     \
    makeTemplatedTurbulenceModel                                               \
-    (singlePhaseTransportModelDPMIncompressibleTurbulenceModel, RAS, Type)
+    (singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, RAS, Type)

 #define makeLESModel(Type)                                                     \
    makeTemplatedTurbulenceModel                                               \
-    (singlePhaseTransportModelDPMIncompressibleTurbulenceModel, LES, Type)
+    (singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, LES, Type)

 #include "Stokes.H"
 makeLaminarModel(Stokes);
--- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
@ -1,6 +1,6 @@
 EXE_INC = \
    -I.. \
-    -I../DPMTurbulenceModels \
+    -I../DPMTurbulenceModels/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/lagrangian/DPMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/Make/options
@ -1,5 +1,5 @@
 EXE_INC = \
-    -I./DPMTurbulenceModels \
+    -I./DPMTurbulenceModels/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@ -13,6 +13,7 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \
    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude

--- a/applications/solvers/lagrangian/DPMFoam/createFields.H
+++ b/applications/solvers/lagrangian/DPMFoam/createFields.H
@ -160,11 +160,10 @@ surfaceScalarField alphaPhic
    alphacf*phic
 );

-
-autoPtr<DPMIncompressibleTurbulenceModel<singlePhaseTransportModel>>
+autoPtr<PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>>
 continuousPhaseTurbulence
 (
-    DPMIncompressibleTurbulenceModel<singlePhaseTransportModel>::New
+    PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>::New
    (
        alphac,
        Uc,
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@ -2,8 +2,6 @@ EXE_INC = \
    -I../reactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I${LIB_SRC}/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
    -I${LIB_SRC}/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
@ -29,8 +27,6 @@ EXE_LIBS = \
    -lfiniteVolume \
    -lfvOptions \
    -lmeshTools \
-    -ldynamicMesh \
-    -ldynamicFvMesh \
    -lsampling \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
--- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
@ -23,7 +23,6 @@ surfaceScalarField phiHbyA
  + phig
 );

-fvc::makeRelative(phiHbyA, rho, U);
 MRF.makeRelative(fvc::interpolate(rho), phiHbyA);

 // Update the pressure BCs to ensure flux consistency
@ -82,15 +81,7 @@ else if (pimple.SIMPLErho())
    rho = thermo.rho();
 }

-// Correct rhoUf if the mesh is moving
-fvc::correctRhoUf(rhoUf, rho, U, phi);
-
 if (thermo.dpdt())
 {
    dpdt = fvc::ddt(p);
-
-    if (mesh.moving())
-    {
-        dpdt -= fvc::div(fvc::meshPhi(rho, U), p);
-    }
 }
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
@ -3,8 +3,6 @@ EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I${LIB_SRC}/sampling/lnInclude \
    -I${LIB_SRC}/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@ -30,8 +28,6 @@ EXE_LIBS = \
    -lfvOptions \
    -lsampling \
    -lmeshTools \
-    -ldynamicMesh \
-    -ldynamicFvMesh \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
    -lspecie \
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@ -5,8 +5,8 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011-2020 OpenFOAM Foundation
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2018-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -37,8 +37,8 @@ Description
 \*---------------------------------------------------------------------------*/

 #include "fvCFD.H"
-#include "dynamicFvMesh.H"
 #include "turbulentFluidThermoModel.H"
+
 #include "surfaceFilmModel.H"
 #include "rhoReactionThermo.H"
 #include "CombustionModel.H"
@ -47,7 +47,6 @@ Description
 #include "fvOptions.H"
 #include "pimpleControl.H"
 #include "pressureControl.H"
-#include "CorrectPhi.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 #include "cloudMacros.H"
@ -77,13 +76,13 @@ int main(int argc, char *argv[])
    #include "addCheckCaseOptions.H"
    #include "setRootCaseLists.H"
    #include "createTime.H"
-    #include "createDynamicFvMesh.H"
-    #include "createDyMControls.H"
+    #include "createMesh.H"
+    #include "createControl.H"
+    #include "createTimeControls.H"
    #include "createFields.H"
    #include "createFieldRefs.H"
    #include "createRegionControls.H"
    #include "initContinuityErrs.H"
-    #include "createRhoUfIfPresent.H"

    turbulence->validate();

@ -99,23 +98,7 @@ int main(int argc, char *argv[])

    while (runTime.run())
    {
-        #include "readDyMControls.H"
-
-        // Store divrhoU from the previous mesh
-        // so that it can be mapped and used in correctPhi
-        // to ensure the corrected phi has the same divergence
-        autoPtr<volScalarField> divrhoU;
-        if (solvePrimaryRegion && correctPhi)
-        {
-            divrhoU.reset
-            (
-                new volScalarField
-                (
-                    "divrhoU",
-                    fvc::div(fvc::absolute(phi, rho, U))
-                )
-            );
-        }
+        #include "readTimeControls.H"

        if (LTS)
        {
@ -131,44 +114,6 @@ int main(int argc, char *argv[])

        Info<< "Time = " << runTime.timeName() << nl << endl;

-        // Store momentum to set rhoUf for introduced faces.
-        autoPtr<volVectorField> rhoU;
-        if (solvePrimaryRegion && rhoUf.valid())
-        {
-            rhoU.reset(new volVectorField("rhoU", rho*U));
-        }
-
-        // Store the particle positions
-        parcels.storeGlobalPositions();
-
-        // Do any mesh changes
-        mesh.update();
-
-        if (solvePrimaryRegion && mesh.changing())
-        {
-            gh = (g & mesh.C()) - ghRef;
-            ghf = (g & mesh.Cf()) - ghRef;
-
-            MRF.update();
-
-            if (correctPhi)
-            {
-                // Calculate absolute flux
-                // from the mapped surface velocity
-                phi = mesh.Sf() & rhoUf();
-
-                #include "../../compressible/rhoPimpleFoam/correctPhi.H"
-
-                // Make the fluxes relative to the mesh-motion
-                fvc::makeRelative(phi, rho, U);
-            }
-
-            if (checkMeshCourantNo)
-            {
-                #include "meshCourantNo.H"
-            }
-        }
-
        parcels.evolve();
        surfaceFilm.evolve();

--- a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H
@ -103,7 +103,7 @@ License
        );
    }

-    // Update the boundary values of the reciprocal time-step
+    // Update tho boundary values of the reciprocal time-step
    rDeltaT.correctBoundaryConditions();

    // Spatially smooth the time scale field
--- a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
+++ b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -52,7 +52,7 @@ Description
 #include "CorrectPhi.H"
 #include "fvcSmooth.H"

-#include "basicKinematicCloud.H"
+#include "basicKinematicMPPICCloud.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/multiphase/MPPICInterFoam/createFields.H
+++ b/applications/solvers/multiphase/MPPICInterFoam/createFields.H
@ -147,7 +147,7 @@ volScalarField alphacRho(alphac*rho);
 alphacRho.oldTime();

 Info<< "Constructing kinematicCloud " << endl;
-basicKinematicCloud kinematicCloud
+basicKinematicMPPICCloud kinematicCloud
 (
    "kinematicCloud",
    rho,
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
@ -11,6 +11,5 @@ wmake $targetType
 wmake $targetType compressibleInterDyMFoam
 wmake $targetType compressibleInterFilmFoam
 wmake $targetType compressibleInterIsoFoam
-wmake $targetType overCompressibleInterDyMFoam

 #------------------------------------------------------------------------------
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -83,7 +83,7 @@ VoFPatchTransfer::VoFPatchTransfer
        pbm.size() - film.regionMesh().globalData().processorPatches().size()
    );

-    wordRes patchNames;
+    wordReList patchNames;
    if (coeffDict_.readIfPresent("patches", patchNames))
    {
        patchIDs_ = pbm.patchSet(patchNames).sortedToc();
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
@ -144,11 +144,10 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource
    ),
    curTimeIndex_(-1)
 {
-    fieldNames_.resize(2);
+    fieldNames_.setSize(2);
    fieldNames_[0] = "U";
    fieldNames_[1] = "T";
-
-    fv::option::resetApplied();
+    applied_.setSize(fieldNames_.size(), false);
 }


--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C
@ -41,6 +41,10 @@ bool Foam::fv::VoFSolidificationMeltingSource::read(const dictionary& dict)

        return true;
    }
+    else
+    {
+        return false;
+    }

    return false;
 }
--- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/files
+++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/files
@ -1,3 +0,0 @@
-overCompressibleInterDyMFoam.C
-
-EXE = $(FOAM_APPBIN)/overCompressibleInterDyMFoam
--- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options
@ -1,40 +0,0 @@
-EXE_INC = \
-    -I.. \
-    -I../../VoF \
-    -I../../interFoam/overInterDyMFoam \
-    -I../twoPhaseMixtureThermo \
-    -I../VoFphaseCompressibleTurbulenceModels/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(FOAM_SOLVERS)/incompressible/pimpleFoam/overPimpleDyMFoam \
-    -I$(LIB_SRC)/overset/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -lfvOptions \
-    -lmeshTools \
-    -ltwoPhaseMixtureThermo \
-    -ltwoPhaseSurfaceTension \
-    -lcompressibleTransportModels \
-    -lfluidThermophysicalModels \
-    -lspecie \
-    -ltwoPhaseMixture \
-    -ltwoPhaseProperties \
-    -linterfaceProperties \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lVoFphaseCompressibleTurbulenceModels \
-    -ldynamicMesh \
-    -ldynamicFvMesh \
-    -ltopoChangerFvMesh \
-    -loverset \
-    -lwaveModels
--- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/TEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/TEqn.H
@ -1,28 +0,0 @@
-{
-    fvScalarMatrix TEqn
-    (
-        fvm::ddt(rho, T) + fvm::div(rhoPhi, T) - fvm::Sp(contErr, T)
-      - fvm::laplacian(turbulence.alphaEff(), T)
-      + (
-             divUp()// - contErr/rho*p
-          +  (fvc::ddt(rho, K) + fvc::div(rhoPhi, K))() - contErr*K
-        )
-       *(
-           alpha1()/mixture.thermo1().Cv()()
-         + alpha2()/mixture.thermo2().Cv()()
-        )
-     ==
-        fvOptions(rho, T)
-    );
-
-    TEqn.relax();
-
-    fvOptions.constrain(TEqn);
-
-    TEqn.solve();
-
-    fvOptions.correct(T);
-
-    mixture.correctThermo();
-    mixture.correct();
-}
--- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/UEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/UEqn.H
@ -1,36 +0,0 @@
-    MRF.correctBoundaryVelocity(U);
-
-    fvVectorMatrix UEqn
-    (
-        fvm::ddt(rho, U) + fvm::div(rhoPhi, U)
-      - fvm::Sp(contErr, U)
-      + MRF.DDt(rho, U)
-      + turbulence.divDevRhoReff(U)
-     ==
-        fvOptions(rho, U)
-    );
-
-    UEqn.relax();
-
-    fvOptions.constrain(UEqn);
-
-    if (pimple.momentumPredictor())
-    {
-        solve
-        (
-            UEqn
-         ==
-            cellMask*fvc::reconstruct
-            (
-                (
-                    mixture.surfaceTensionForce()
-                  - ghf*fvc::snGrad(rho)
-                  - fvc::snGrad(p_rgh)
-                ) * mesh.magSf()
-            )
-        );
-
-        fvOptions.correct(U);
-
-        K = 0.5*magSqr(U);
-    }
--- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/alphaSuSp.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/alphaSuSp.H
@ -1,43 +0,0 @@
-volScalarField::Internal Sp
-(
-    IOobject
-    (
-        "Sp",
-        runTime.timeName(),
-        mesh
-    ),
-    mesh,
-    dimensionedScalar(dgdt.dimensions(), Zero)
-);
-
-volScalarField::Internal Su
-(
-    IOobject
-    (
-        "Su",
-        runTime.timeName(),
-        mesh
-    ),
-    mesh,
-    dimensionedScalar(dgdt.dimensions(), Zero)
-);
-
-forAll(dgdt, celli)
-{
-    if (dgdt[celli] > 0.0)
-    {
-        Sp[celli] -= dgdt[celli]/max(1.0 - alpha1[celli], 1e-4);
-        Su[celli] += dgdt[celli]/max(1.0 - alpha1[celli], 1e-4);
-    }
-    else if (dgdt[celli] < 0.0)
-    {
-        Sp[celli] += dgdt[celli]/max(alpha1[celli], 1e-4);
-    }
-}
-
-volScalarField::Internal divU
-(
-    mesh.moving()
-  ? fvc::div(phi + mesh.phi())
-  : fvc::div(phi)
-);
--- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/createFields.H
@ -1,138 +0,0 @@
-#include "createRDeltaT.H"
-
-Info<< "Reading field p_rgh\n" << endl;
-volScalarField p_rgh
-(
-    IOobject
-    (
-        "p_rgh",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-Info<< "Reading field U\n" << endl;
-volVectorField U
-(
-    IOobject
-    (
-        "U",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-#include "createPhi.H"
-
-Info<< "Constructing twoPhaseMixtureThermo\n" << endl;
-twoPhaseMixtureThermo mixture(U, phi);
-
-volScalarField& alpha1(mixture.alpha1());
-volScalarField& alpha2(mixture.alpha2());
-
-Info<< "Reading thermophysical properties\n" << endl;
-
-const volScalarField& rho1 = mixture.thermo1().rho();
-const volScalarField& rho2 = mixture.thermo2().rho();
-
-volScalarField rho
-(
-    IOobject
-    (
-        "rho",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    alpha1*rho1 + alpha2*rho2
-);
-
-
-dimensionedScalar pMin
-(
-    "pMin",
-    dimPressure,
-    mixture
-);
-
-mesh.setFluxRequired(p_rgh.name());
-mesh.setFluxRequired(alpha1.name());
-
-
-#include "readGravitationalAcceleration.H"
-#include "readhRef.H"
-#include "gh.H"
-
-
-// Mass flux
-// Initialisation does not matter because rhoPhi is reset after the
-// alpha1 solution before it is used in the U equation.
-surfaceScalarField rhoPhi
-(
-    IOobject
-    (
-        "rhoPhi",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::NO_WRITE
-    ),
-    fvc::interpolate(rho)*phi
-);
-
-volScalarField dgdt(alpha1*fvc::div(phi));
-
-#include "createAlphaFluxes.H"
-
-// Construct compressible turbulence model
-compressibleInterPhaseTransportModel turbulence
-(
-    rho,
-    U,
-    phi,
-    rhoPhi,
-    alphaPhi10,
-    mixture
-);
-
-#include "createK.H"
-
-#include "createMRF.H"
-#include "createFvOptions.H"
-
-// Overset specific
-
-// Add solver-specific interpolations
-{
-    wordHashSet& nonInt =
-        const_cast<wordHashSet&>(Stencil::New(mesh).nonInterpolatedFields());
-
-    nonInt.insert("HbyA");
-    nonInt.insert("grad(p_rgh)");
-    nonInt.insert("nHat");
-    nonInt.insert("surfaceIntegrate(phi)");
-    nonInt.insert("surfaceIntegrate(phiHbyA)");
-    nonInt.insert("cellMask");
-    nonInt.insert("cellDisplacement");
-    nonInt.insert("interpolatedCells");
-    nonInt.insert("cellInterpolationWeight");
-    nonInt.insert("pcorr");
-}
-
-// Mask field for zeroing out contributions on hole cells
-#include "createCellMask.H"
-
-surfaceScalarField faceMask
-(
-    localMin<scalar>(mesh).interpolate(cellMask)
-);
-
-// Create bool field with interpolated cells
-#include "createInterpolatedCells.H"
--- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/overCompressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/overCompressibleInterDyMFoam.C
@ -1,240 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
-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
-    overCompressibleInterDyMFoam
-
-Group
-    grpMultiphaseSolvers
-
-Description
-    Solver for two compressible, non-isothermal, immiscible fluids using VOF
-    (i.e. volume of fluid) phase-fraction based interface capturing approach.
-
-    This solver supports dynamic mesh motions including overset cases.
-
-    The momentum and other fluid properties are of the "mixture" and a single
-    momentum equation is solved.
-
-    Either mixture or two-phase transport modelling may be selected.  In the
-    mixture approach, a single laminar, RAS or LES model is selected to model
-    the momentum stress.  In the Euler-Euler two-phase approach separate
-    laminar, RAS or LES selected models are selected for each of the phases.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "dynamicFvMesh.H"
-#include "CMULES.H"
-#include "EulerDdtScheme.H"
-#include "CrankNicolsonDdtScheme.H"
-#include "subCycle.H"
-#include "compressibleInterPhaseTransportModel.H"
-#include "pimpleControl.H"
-#include "fvOptions.H"
-#include "fvcSmooth.H"
-
-#include "cellCellStencilObject.H"
-#include "localMin.H"
-#include "interpolationCellPoint.H"
-#include "transform.H"
-#include "fvMeshSubset.H"
-#include "oversetAdjustPhi.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    argList::addNote
-    (
-        "Solver for two compressible, non-isothermal, immiscible fluids"
-        " using VOF phase-fraction based interface capturing approach.\n"
-        "Supports dynamic mesh motions including overset cases."
-    );
-
-    #include "postProcess.H"
-
-    #include "addCheckCaseOptions.H"
-    #include "setRootCaseLists.H"
-    #include "createTime.H"
-    #include "createDynamicFvMesh.H"
-    pimpleControl pimple(mesh);
-
-    #include "createTimeControls.H"
-    #include "createDyMControls.H"
-    #include "createFields.H"
-
-    volScalarField& p = mixture.p();
-    volScalarField& T = mixture.T();
-    const volScalarField& psi1 = mixture.thermo1().psi();
-    const volScalarField& psi2 = mixture.thermo2().psi();
-
-    #include "correctPhi.H"
-    #include "createUf.H"
-
-    if (!LTS)
-    {
-        #include "CourantNo.H"
-        #include "setInitialDeltaT.H"
-    }
-
-    #include "setCellMask.H"
-    #include "setInterpolatedCells.H"
-
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.run())
-    {
-        #include "readControls.H"
-
-        if (LTS)
-        {
-            #include "setRDeltaT.H"
-        }
-        else
-        {
-            #include "CourantNo.H"
-            #include "alphaCourantNo.H"
-            #include "setDeltaT.H"
-        }
-
-        ++runTime;
-
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        // --- Pressure-velocity PIMPLE corrector loop
-        while (pimple.loop())
-        {
-            if (pimple.firstIter() || moveMeshOuterCorrectors)
-            {
-                scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
-
-                mesh.update();
-
-                if (mesh.changing())
-                {
-                    Info<< "Execution time for mesh.update() = "
-                        << runTime.elapsedCpuTime() - timeBeforeMeshUpdate
-                        << " s" << endl;
-
-                    // Do not apply previous time-step mesh compression flux
-                    // if the mesh topology changed
-                    if (mesh.topoChanging())
-                    {
-                        talphaPhi1Corr0.clear();
-                    }
-
-                    gh = (g & mesh.C()) - ghRef;
-                    ghf = (g & mesh.Cf()) - ghRef;
-
-                    // Update cellMask field for blocking out hole cells
-                    #include "setCellMask.H"
-                    #include "setInterpolatedCells.H"
-
-                    faceMask =
-                        localMin<scalar>(mesh).interpolate(cellMask.oldTime());
-
-                    // Zero Uf on old faceMask (H-I)
-                    Uf *= faceMask;
-
-                    const surfaceVectorField Uint(fvc::interpolate(U));
-                    // Update Uf and phi on new C-I faces
-                    Uf += (1-faceMask)*Uint;
-
-                    // Update Uf boundary
-                    forAll(Uf.boundaryField(), patchI)
-                    {
-                        Uf.boundaryFieldRef()[patchI] =
-                            Uint.boundaryField()[patchI];
-                    }
-
-                    phi = mesh.Sf() & Uf;
-
-                    // Correct phi on individual regions
-                    if (correctPhi)
-                    {
-                         #include "correctPhi.H"
-                    }
-
-                    mixture.correct();
-
-                    // Zero phi on current H-I
-                    faceMask = localMin<scalar>(mesh).interpolate(cellMask);
-
-                    phi *= faceMask;
-                    U *= cellMask;
-
-                    // Make the flux relative to the mesh motion
-                    fvc::makeRelative(phi, U);
-
-                }
-
-                if (mesh.changing() && checkMeshCourantNo)
-                {
-                    #include "meshCourantNo.H"
-                }
-            }
-
-            #include "alphaControls.H"
-            #include "compressibleAlphaEqnSubCycle.H"
-
-            const surfaceScalarField faceMask
-            (
-                localMin<scalar>(mesh).interpolate(cellMask)
-            );
-            rhoPhi *= faceMask;
-
-            turbulence.correctPhasePhi();
-
-            #include "UEqn.H"
-            volScalarField divUp("divUp", fvc::div(fvc::absolute(phi, U), p));
-            #include "TEqn.H"
-
-            // --- Pressure corrector loop
-            while (pimple.correct())
-            {
-                #include "pEqn.H"
-            }
-
-            if (pimple.turbCorr())
-            {
-                turbulence.correct();
-            }
-        }
-
-        runTime.write();
-
-        runTime.printExecutionTime(Info);
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
--- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/pEqn.H
@ -1,177 +0,0 @@
-{
-    volScalarField rAU("rAU", 1.0/UEqn.A());
-
-    surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
-
-    surfaceScalarField phiHbyA
-    (
-        "phiHbyA",
-        fvc::flux(HbyA)
-    );
-
-    if (ddtCorr)
-    {
-        surfaceScalarField faceMaskOld
-        (
-            localMin<scalar>(mesh).interpolate(cellMask.oldTime())
-        );
-        phiHbyA +=
-            MRF.zeroFilter
-            (
-                fvc::interpolate(rho*rAU)*faceMaskOld*fvc::ddtCorr(U, Uf)
-            );
-    }
-
-    MRF.makeRelative(phiHbyA);
-
-    surfaceScalarField phig
-    (
-        (
-            mixture.surfaceTensionForce()
-          - ghf*fvc::snGrad(rho)
-        )*faceMask*rAUf*mesh.magSf()
-    );
-
-    phiHbyA += phig;
-
-    // Update the pressure BCs to ensure flux consistency
-    constrainPressure(p_rgh, U, phiHbyA, rAUf, MRF);
-
-    tmp<fvScalarMatrix> p_rghEqnComp1;
-    tmp<fvScalarMatrix> p_rghEqnComp2;
-
-    if (pimple.transonic())
-    {
-        #include "rhofs.H"
-
-        surfaceScalarField phid1("phid1", fvc::interpolate(psi1)*phi);
-        surfaceScalarField phid2("phid2", fvc::interpolate(psi2)*phi);
-
-        p_rghEqnComp1 =
-            pos(alpha1)
-           *(
-                (
-                    fvc::ddt(alpha1, rho1) + fvc::div(alphaPhi1*rho1f)
-                  - (fvOptions(alpha1, mixture.thermo1().rho())&rho1)
-                )/rho1
-              - fvc::ddt(alpha1) - fvc::div(alphaPhi1)
-              + (alpha1/rho1)
-               *correction
-                (
-                    psi1*fvm::ddt(p_rgh)
-                  + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
-                )
-            );
-        p_rghEqnComp1.ref().relax();
-
-        p_rghEqnComp2 =
-            pos(alpha2)
-           *(
-               (
-                   fvc::ddt(alpha2, rho2) + fvc::div(alphaPhi2*rho2f)
-                 - (fvOptions(alpha2, mixture.thermo2().rho())&rho2)
-               )/rho2
-             - fvc::ddt(alpha2) - fvc::div(alphaPhi2)
-             + (alpha2/rho2)
-              *correction
-               (
-                   psi2*fvm::ddt(p_rgh)
-                 + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
-               )
-           );
-        p_rghEqnComp2.ref().relax();
-    }
-    else
-    {
-        #include "rhofs.H"
-
-        p_rghEqnComp1 =
-            pos(alpha1)
-           *(
-                (
-                    fvc::ddt(alpha1, rho1) + fvc::div(alphaPhi1*rho1f)
-                  - (fvOptions(alpha1, mixture.thermo1().rho())&rho1)
-                )/rho1
-              - fvc::ddt(alpha1) - fvc::div(alphaPhi1)
-              + (alpha1*psi1/rho1)*correction(fvm::ddt(p_rgh))
-            );
-
-        p_rghEqnComp2 =
-            pos(alpha2)
-           *(
-               (
-                   fvc::ddt(alpha2, rho2) + fvc::div(alphaPhi2*rho2f)
-                 - (fvOptions(alpha2, mixture.thermo2().rho())&rho2)
-               )/rho2
-             - fvc::ddt(alpha2) - fvc::div(alphaPhi2)
-             + (alpha2*psi2/rho2)*correction(fvm::ddt(p_rgh))
-            );
-    }
-
-    // Cache p_rgh prior to solve for density update
-    volScalarField p_rgh_0(p_rgh);
-
-    while (pimple.correctNonOrthogonal())
-    {
-        fvScalarMatrix p_rghEqnIncomp
-        (
-            fvc::div(phiHbyA)
-          - fvm::laplacian(rAUf, p_rgh)
-        );
-
-        solve
-        (
-            p_rghEqnComp1() + p_rghEqnComp2() + p_rghEqnIncomp,
-            mesh.solver(p_rgh.select(pimple.finalInnerIter()))
-        );
-
-        if (pimple.finalNonOrthogonalIter())
-        {
-            p = max(p_rgh + (alpha1*rho1 + alpha2*rho2)*gh, pMin);
-            p_rgh = p - (alpha1*rho1 + alpha2*rho2)*gh;
-
-            dgdt =
-            (
-                alpha1*(p_rghEqnComp2 & p_rgh)
-              - alpha2*(p_rghEqnComp1 & p_rgh)
-            );
-
-            phi = phiHbyA + p_rghEqnIncomp.flux();
-
-            U =
-                cellMask*
-                (
-                    HbyA
-                  + rAU*fvc::reconstruct((phig + p_rghEqnIncomp.flux())/rAUf)
-                );
-
-            U.correctBoundaryConditions();
-            fvOptions.correct(U);
-        }
-    }
-
-    {
-        Uf = fvc::interpolate(U);
-        surfaceVectorField n(mesh.Sf()/mesh.magSf());
-        Uf += n*(fvc::absolute(phi, U)/mesh.magSf() - (n & Uf));
-    }
-
-    // Make the fluxes relative to the mesh motion
-    fvc::makeRelative(phi, U);
-
-    // Zero faces H-I for transport Eq after pEq
-    phi *= faceMask;
-
-    // Update densities from change in p_rgh
-    mixture.thermo1().correctRho(psi1*(p_rgh - p_rgh_0));
-    mixture.thermo2().correctRho(psi2*(p_rgh - p_rgh_0));
-
-    rho = alpha1*rho1 + alpha2*rho2;
-
-    // Correct p_rgh for consistency with p and the updated densities
-    p_rgh = p - rho*gh;
-    p_rgh.correctBoundaryConditions();
-
-    K = 0.5*magSqr(U);
-}
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -59,23 +59,24 @@ class multiphaseMixtureThermo
 {
 public:

-    //- Symmetric pair of interface names
    class interfacePair
    :
        public Pair<word>
    {
    public:

-        // Always use symmetric hashing
-        using hasher = Pair<word>::symmHasher;
-
-        // Always use symmetric hashing (alias)
-        using hash = Pair<word>::symmHasher;
+        struct hash
+        {
+            label operator()(const interfacePair& key) const
+            {
+                return word::hash()(key.first()) + word::hash()(key.second());
+            }
+        };


        // Constructors

-            interfacePair() = default;
+            interfacePair() {} // = default

            interfacePair(const word& alpha1Name, const word& alpha2Name)
            :
@ -96,7 +97,11 @@ public:
                const interfacePair& b
            )
            {
-                return (0 != Pair<word>::compare(a, b));
+                return
+                (
+                    ((a.first() == b.first()) && (a.second() == b.second()))
+                 || ((a.first() == b.second()) && (a.second() == b.first()))
+                );
            }

            friend bool operator!=
@ -112,7 +117,7 @@ public:

 private:

-    // Private Data
+    // Private data

        //- Dictionary of phases
        PtrDictionary<phaseModel> phases_;
@ -135,7 +140,7 @@ private:
        const dimensionedScalar deltaN_;


-    // Private Member Functions
+    // Private member functions

        void calcAlphas();

--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
@ -7,7 +7,6 @@ EXE_INC = \
    -I$(LIB_SRC)/fvOptions/lnInclude\
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
@ -15,15 +14,13 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(FOAM_SOLVERS)/multiphase/interFoam
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude

 EXE_LIBS = \
    -lfiniteVolume \
    -lfvOptions \
    -lmeshTools \
    -lsampling \
-    -ldynamicFvMesh \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
    -lcompressibleTransportModels \
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/icoReactingMultiphaseInterFoam.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/icoReactingMultiphaseInterFoam.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -42,14 +42,16 @@ Description
 \*---------------------------------------------------------------------------*/

 #include "fvCFD.H"
-#include "dynamicFvMesh.H"
 #include "subCycle.H"
 #include "multiphaseSystem.H"
 #include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
+#include "fixedFluxPressureFvPatchScalarField.H"
 #include "radiationModel.H"
-#include "CorrectPhi.H"
+#include "HashPtrTable.H"
+#include "fvcDDt.H"
+#include "zeroField.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

@ -68,18 +70,14 @@ int main(int argc, char *argv[])

    #include "setRootCaseLists.H"
    #include "createTime.H"
-    #include "createDynamicFvMesh.H"
+    #include "createMesh.H"

-    #include "initContinuityErrs.H"
-    #include "createDyMControls.H"
+    pimpleControl pimple(mesh);

    #include "createFields.H"
    #include "createFieldRefs.H"
-
-    #include "initCorrectPhi.H"
-    #include "createUfIfPresent.H"
-
    #include "createFvOptions.H"
+    #include "createTimeControls.H"
    #include "CourantNo.H"
    #include "setInitialDeltaT.H"

@ -91,8 +89,7 @@ int main(int argc, char *argv[])

    while (runTime.run())
    {
-        #include "readDyMControls.H"
-
+        #include "readTimeControls.H"
        #include "CourantNo.H"
        #include "alphaCourantNo.H"
        #include "setDeltaT.H"
@ -108,28 +105,6 @@ int main(int argc, char *argv[])
        // --- Pressure-velocity PIMPLE corrector loop
        while (pimple.loop())
        {
-            if (pimple.firstIter() || moveMeshOuterCorrectors)
-            {
-                mesh.update();
-
-                if (mesh.changing())
-                {
-                    gh = (g & mesh.C()) - ghRef;
-                    ghf = (g & mesh.Cf()) - ghRef;
-
-                    if (correctPhi)
-                    {
-                        // Calculate absolute flux
-                        // from the mapped surface velocity
-                        phi = mesh.Sf() & Uf();
-
-                        #include "correctPhi.H"
-
-                        // Make the flux relative to the mesh motion
-                        fvc::makeRelative(phi, U);
-                    }
-                }
-            }
            #include "UEqn.H"
            #include "YEqns.H"
            #include "TEqn.H"
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/pEqn.H
@ -1,31 +1,17 @@
 {
-    if (correctPhi)
-    {
-        rAU.ref() = 1.0/UEqn.A();
-    }
-    else
-    {
-        rAU = 1.0/UEqn.A();
-    }
-
-    surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU()));
+    volScalarField rAU("rAU", 1.0/UEqn.A());
+    surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));

    volVectorField HbyA("HbyA", U);
-    HbyA = rAU()*UEqn.H();
+    HbyA = rAU*UEqn.H();

    surfaceScalarField phiHbyA
    (
        "phiHbyA",
        (fvc::interpolate(HbyA) & mesh.Sf())
-      + fvc::interpolate(rho*rAU())*fvc::ddtCorr(U, phi)
+      + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
    );
-
-    if (p_rgh.needReference())
-    {
-        fvc::makeRelative(phiHbyA, U);
-        adjustPhi(phiHbyA, U, p_rgh);
-        fvc::makeAbsolute(phiHbyA, U);
-    }
+    adjustPhi(phiHbyA, U, p_rgh);

    surfaceScalarField phig
    (
@ -64,7 +50,7 @@

            p_rgh.relax();

-            U = HbyA + rAU()*fvc::reconstruct((phig + p_rghEqn.flux())/rAUf);
+            U = HbyA + rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rAUf);

            U.correctBoundaryConditions();
            fvOptions.correct(U);
@ -72,14 +58,6 @@
        }
    }

-    #include "continuityErrs.H"
-
-    // Correct Uf if the mesh is moving
-    fvc::correctUf(Uf, U, phi);
-
-    // Make the fluxes relative to the mesh motion
-    fvc::makeRelative(phi, U);
-
    p == p_rgh + rho*gh;

    if (p_rgh.needReference())
@ -92,9 +70,4 @@
        );
        p_rgh = p - rho*gh;
    }
-
-    if (!correctPhi)
-    {
-        rAU.clear();
-    }
 }
--- a/applications/solvers/multiphase/interFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/Make/options
@ -1,7 +1,5 @@
 EXE_INC = \
    -I../VoF \
-    -I$(LIB_SRC)/phaseSystemModels/twoPhaseInter/incompressibleInterPhaseTransportModel/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/twoPhaseInter/VoFphaseIncompressibleTurbulenceModels/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/sampling/lnInclude \
@ -12,7 +10,6 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \
    -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude

 EXE_LIBS = \
@ -26,6 +23,4 @@ EXE_LIBS = \
    -limmiscibleIncompressibleTwoPhaseMixture \
    -lturbulenceModels \
    -lincompressibleTurbulenceModels \
-    -lwaveModels \
-    -lVoFphaseTurbulentTransportModels \
-    -lincompressibleInterPhaseTransportModels
+    -lwaveModels
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@ -70,19 +70,14 @@ surfaceScalarField rhoPhi
    fvc::interpolate(rho)*phi
 );

-typedef incompressibleInterPhaseTransportModel
-    <
-        immiscibleIncompressibleTwoPhaseMixture
-    > transportModelType;

-autoPtr<transportModelType> turbulence
+// Construct incompressible turbulence model
+autoPtr<incompressible::turbulenceModel> turbulence
 (
-    new transportModelType
-    (
-        rho, U, phi, rhoPhi, mixture
-    )
+    incompressible::turbulenceModel::New(U, phi, mixture)
 );

+
 #include "readGravitationalAcceleration.H"
 #include "readhRef.H"
 #include "gh.H"
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@ -6,7 +6,6 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -46,7 +45,6 @@ Description
 #include "CrankNicolsonDdtScheme.H"
 #include "subCycle.H"
 #include "immiscibleIncompressibleTwoPhaseMixture.H"
-#include "incompressibleInterPhaseTransportModel.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
@ -78,6 +76,8 @@ int main(int argc, char *argv[])
    #include "initCorrectPhi.H"
    #include "createUfIfPresent.H"

+    turbulence->validate();
+
    if (!LTS)
    {
        #include "CourantNo.H"
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/overInterDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/overInterDyMFoam.C
@ -97,15 +97,9 @@ int main(int argc, char *argv[])
        dimensionedScalar("rAUf", dimTime/rho.dimensions(), 1.0)
    );

-    if (correctPhi)
-    {
-        #include "correctPhi.H"
-    }
+    #include "correctPhi.H"
    #include "createUf.H"

-    #include "setCellMask.H"
-    #include "setInterpolatedCells.H"
-
    turbulence->validate();

    if (!LTS)
@ -114,6 +108,9 @@ int main(int argc, char *argv[])
        #include "setInitialDeltaT.H"
    }

+    #include "setCellMask.H"
+    #include "setInterpolatedCells.H"
+
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
    Info<< "\nStarting time loop\n" << endl;

--- a/applications/solvers/multiphase/interIsoFoam/Make/options
+++ b/applications/solvers/multiphase/interIsoFoam/Make/options
@ -1,7 +1,5 @@
 EXE_INC = \
    -I../VoF \
-    -I$(LIB_SRC)/phaseSystemModels/twoPhaseInter/incompressibleInterPhaseTransportModel/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/twoPhaseInter/VoFphaseIncompressibleTurbulenceModels/lnInclude \
    -I../interFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
@ -16,7 +14,6 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \
    -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude

 EXE_LIBS = \
@ -32,6 +29,4 @@ EXE_LIBS = \
    -lturbulenceModels \
    -lincompressibleTurbulenceModels \
    -lwaveModels \
-    -lgeometricVoF \
-    -lVoFphaseTurbulentTransportModels \
-    -lincompressibleInterPhaseTransportModels
+    -lgeometricVoF
--- a/applications/solvers/multiphase/interIsoFoam/createFields.H
+++ b/applications/solvers/multiphase/interIsoFoam/createFields.H
@ -71,17 +71,10 @@ surfaceScalarField rhoPhi
 );


-typedef incompressibleInterPhaseTransportModel
-    <
-        immiscibleIncompressibleTwoPhaseMixture
-    > transportModelType;
-
-autoPtr<transportModelType> turbulence
+// Construct incompressible turbulence model
+autoPtr<incompressible::turbulenceModel> turbulence
 (
-    new transportModelType
-    (
-        rho, U, phi, rhoPhi, mixture
-    )
+    incompressible::turbulenceModel::New(U, phi, mixture)
 );


--- a/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C
+++ b/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C
@ -10,7 +10,6 @@
    Copyright (C) 2017 OpenCFD Ltd.
    Copyright (C) 2018 Johan Roenby
    Copyright (C) 2019-2020 DLR
-    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -60,7 +59,7 @@ Description
 #include "CrankNicolsonDdtScheme.H"
 #include "subCycle.H"
 #include "immiscibleIncompressibleTwoPhaseMixture.H"
-#include "incompressibleInterPhaseTransportModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
@ -92,6 +91,8 @@ int main(int argc, char *argv[])
    #include "initCorrectPhi.H"
    #include "createUfIfPresent.H"

+    turbulence->validate();
+
    #include "CourantNo.H"
    #include "setInitialDeltaT.H"

--- a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
@ -4,9 +4,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------

 wmake $targetType phaseChangeTwoPhaseMixtures
-
 wmake $targetType
 wmake $targetType interPhaseChangeDyMFoam
-wmake $targetType overInterPhaseChangeDyMFoam

 #------------------------------------------------------------------------------
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
@ -9,12 +9,7 @@
        phic += (interface.cAlpha()*icAlpha)*fvc::interpolate(mag(U));
    }

-    volScalarField divU
-    (
-        mesh.moving()
-      ? fvc::div(phi + mesh.phi())
-      : fvc::div(phi)
-    );
+    volScalarField divU(fvc::div(phi));

    if (nAlphaSubCycles > 1)
    {
--- a/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/Make/files
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/Make/files
@ -1,3 +0,0 @@
-overInterPhaseChangeDyMFoam.C
-
-EXE = $(FOAM_APPBIN)/overInterPhaseChangeDyMFoam
--- a/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/Make/options
@ -1,35 +0,0 @@
-EXE_INC = \
-    -I.. \
-    -I../../interFoam/overInterDyMFoam \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-    -I../phaseChangeTwoPhaseMixtures/lnInclude \
-    -I$(FOAM_SOLVERS)/incompressible/pimpleFoam/overPimpleDyMFoam \
-    -I$(LIB_SRC)/overset/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -lfvOptions \
-    -lmeshTools \
-    -lsampling \
-    -lphaseChangeTwoPhaseMixtures \
-    -ltwoPhaseMixture \
-    -linterfaceProperties \
-    -ltwoPhaseProperties \
-    -lincompressibleTransportModels \
-    -lturbulenceModels \
-    -lincompressibleTurbulenceModels \
-    -ldynamicMesh \
-    -ldynamicFvMesh \
-    -ltopoChangerFvMesh \
-    -loverset \
-    -lwaveModels
--- a/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/UEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/UEqn.H
@ -1,31 +0,0 @@
-    fvVectorMatrix UEqn
-    (
-        fvm::ddt(rho, U) + fvm::div(rhoPhi, U)
-      - fvm::Sp(fvc::ddt(rho) + fvc::div(rhoPhi), U)
-      + turbulence->divDevRhoReff(rho, U)
-     ==
-        fvOptions(rho, U)
-    );
-
-    UEqn.relax();
-
-    fvOptions.constrain(UEqn);
-
-    if (pimple.momentumPredictor())
-    {
-        solve
-        (
-            UEqn
-         ==
-            cellMask*fvc::reconstruct
-            (
-                (
-                    interface.surfaceTensionForce()
-                  - ghf*fvc::snGrad(rho)
-                  - fvc::snGrad(p_rgh)
-                ) * mesh.magSf()
-            )
-        );
-
-        fvOptions.correct(U);
-    }
--- a/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/correctPhi.H
@ -1,11 +0,0 @@
-CorrectPhi
-(
-    U,
-    phi,
-    p_rgh,
-    surfaceScalarField("rAUf", fvc::interpolate(rAU)),
-    divU,
-    pimple
-);
-
-#include "continuityErrs.H"
--- a/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/createFields.H
@ -1,158 +0,0 @@
-Info<< "Reading field p_rgh\n" << endl;
-volScalarField p_rgh
-(
-    IOobject
-    (
-        "p_rgh",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-Info<< "Reading field U\n" << endl;
-volVectorField U
-(
-    IOobject
-    (
-        "U",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-#include "createPhi.H"
-
-
-Info<< "Creating phaseChangeTwoPhaseMixture\n" << endl;
-autoPtr<phaseChangeTwoPhaseMixture> mixture =
-    phaseChangeTwoPhaseMixture::New(U, phi);
-
-volScalarField& alpha1(mixture->alpha1());
-volScalarField& alpha2(mixture->alpha2());
-
-const dimensionedScalar& rho1 = mixture->rho1();
-const dimensionedScalar& rho2 = mixture->rho2();
-
-
-// Need to store rho for ddt(rho, U)
-volScalarField rho
-(
-    IOobject
-    (
-        "rho",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT
-    ),
-    alpha1*rho1 + alpha2*rho2
-);
-rho.oldTime();
-
-
-// Construct interface from alpha1 distribution
-interfaceProperties interface(alpha1, U, mixture());
-
-// Construct incompressible turbulence model
-autoPtr<incompressible::turbulenceModel> turbulence
-(
-    incompressible::turbulenceModel::New(U, phi, mixture())
-);
-
-
-#include "readGravitationalAcceleration.H"
-#include "readhRef.H"
-#include "gh.H"
-
-
-volScalarField p
-(
-    IOobject
-    (
-        "p",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    p_rgh + rho*gh
-);
-
-label pRefCell = 0;
-scalar pRefValue = 0.0;
-setRefCell
-(
-    p,
-    p_rgh,
-    pimple.dict(),
-    pRefCell,
-    pRefValue
-);
-
-if (p_rgh.needReference())
-{
-    p += dimensionedScalar
-    (
-        "p",
-        p.dimensions(),
-        pRefValue - getRefCellValue(p, pRefCell)
-    );
-    p_rgh = p - rho*gh;
-}
-
-mesh.setFluxRequired(p_rgh.name());
-mesh.setFluxRequired(alpha1.name());
-
-#include "createFvOptions.H"
-
-IOobject alphaPhi10Header
-(
-    IOobject::groupName("alphaPhi0", alpha1.group()),
-    runTime.timeName(),
-    mesh,
-    IOobject::NO_READ,
-    IOobject::NO_WRITE
-);
-
-// MULES flux from previous time-step
-surfaceScalarField alphaPhi10
-(
-    alphaPhi10Header,
-    phi*fvc::interpolate(alpha1)
-);
-
-
-// Overset specific
-
-// Add solver-specific interpolations
-{
-    wordHashSet& nonInt =
-        const_cast<wordHashSet&>(Stencil::New(mesh).nonInterpolatedFields());
-
-    nonInt.insert("HbyA");
-    nonInt.insert("grad(p_rgh)");
-    nonInt.insert("nHat");
-    nonInt.insert("surfaceIntegrate(phi)");
-    nonInt.insert("surfaceIntegrate(phiHbyA)");
-    nonInt.insert("cellMask");
-    nonInt.insert("cellDisplacement");
-    nonInt.insert("interpolatedCells");
-    nonInt.insert("cellInterpolationWeight");
-    nonInt.insert("pcorr");
-}
-
-// Mask field for zeroing out contributions on hole cells
-#include "createCellMask.H"
-
-surfaceScalarField faceMask
-(
-    localMin<scalar>(mesh).interpolate(cellMask)
-);
-
-// Create bool field with interpolated cells
-#include "createInterpolatedCells.H"
--- a/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/overInterPhaseChangeDyMFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/overInterPhaseChangeDyMFoam.C
@ -1,250 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD OpenCFD Ltd.
-------------------------------------------------------------------------------
-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
-    overInterPhaseChangeDyMFoam
-
-Group
-    grpMultiphaseSolvers grpMovingMeshSolvers
-
-Description
-    Solver for two incompressible, isothermal, immiscible fluids with
-    phase-change (e.g. cavitation) using VOF (i.e. volume of fluid)
-    phase-fraction based interface capturing, with optional dynamic mesh
-    motion (including overset) and mesh topology changes including adaptive
-    re-meshing.
-
-    The momentum and other fluid properties are of the "mixture" and a
-    single momentum equation is solved.
-
-    The set of phase-change models provided are designed to simulate cavitation
-    but other mechanisms of phase-change are supported within this solver
-    framework.
-
-    Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "dynamicFvMesh.H"
-#include "CMULES.H"
-#include "subCycle.H"
-#include "interfaceProperties.H"
-#include "phaseChangeTwoPhaseMixture.H"
-#include "turbulentTransportModel.H"
-#include "pimpleControl.H"
-#include "fvOptions.H"
-#include "CorrectPhi.H"
-
-#include "cellCellStencilObject.H"
-#include "localMin.H"
-#include "interpolationCellPoint.H"
-#include "transform.H"
-#include "oversetAdjustPhi.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    argList::addNote
-    (
-        "Solver for two incompressible, isothermal, immiscible fluids with"
-        " phase-change\n"
-        "using VOF (volume of fluid) phase-fraction based interface capturing,"
-        " with optional dynamic mesh motion (including overset)\n"
-        "and mesh topology changes including adaptive re-meshing."
-    );
-
-    #include "postProcess.H"
-
-    #include "setRootCaseLists.H"
-    #include "createTime.H"
-    #include "createDynamicFvMesh.H"
-    pimpleControl pimple(mesh);
-
-    #include "createTimeControls.H"
-    #include "createDyMControls.H"
-    #include "initContinuityErrs.H"
-    #include "createFields.H"
-
-    volScalarField rAU
-    (
-        IOobject
-        (
-            "rAU",
-            runTime.timeName(),
-            mesh,
-            IOobject::READ_IF_PRESENT,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("rAUf", dimTime/rho.dimensions(), 1.0)
-    );
-
-    #include "createUf.H"
-    #include "CourantNo.H"
-    #include "setInitialDeltaT.H"
-
-    turbulence->validate();
-
-    #include "setCellMask.H"
-    #include "setInterpolatedCells.H"
-
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.run())
-    {
-        #include "readControls.H"
-
-        // Store divU from the previous mesh so that it can be mapped
-        // and used in correctPhi to ensure the corrected phi has the
-        // same divergence
-        volScalarField divU("divU0", fvc::div(fvc::absolute(phi, U)));
-
-        #include "CourantNo.H"
-        #include "setDeltaT.H"
-
-        ++runTime;
-
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        // --- Pressure-velocity PIMPLE corrector loop
-        while (pimple.loop())
-        {
-            if (pimple.firstIter() || moveMeshOuterCorrectors)
-            {
-                scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
-
-                mesh.update();
-
-                if (mesh.changing())
-                {
-                    Info<< "Execution time for mesh.update() = "
-                        << runTime.elapsedCpuTime() - timeBeforeMeshUpdate
-                        << " s" << endl;
-
-                    gh = (g & mesh.C()) - ghRef;
-                    ghf = (g & mesh.Cf()) - ghRef;
-
-                     // Update cellMask field for blocking out hole cells
-                    #include "setCellMask.H"
-                    #include "setInterpolatedCells.H"
-
-                    faceMask =
-                        localMin<scalar>(mesh).interpolate(cellMask.oldTime());
-
-
-                    // Zero Uf on old faceMask (H-I)
-                    Uf *= faceMask;
-
-                    const surfaceVectorField Uint(fvc::interpolate(U));
-                    // Update Uf and phi on new C-I faces
-                    Uf += (1-faceMask)*Uint;
-
-                    // Update Uf boundary
-                    forAll(Uf.boundaryField(), patchI)
-                    {
-                        Uf.boundaryFieldRef()[patchI] =
-                            Uint.boundaryField()[patchI];
-                    }
-
-                    phi = mesh.Sf() & Uf;
-
-                    if (correctPhi)
-                    {
-                        #include "correctPhi.H"
-                    }
-
-                    mixture->correct();
-
-                    // Zero phi on current H-I
-                    faceMask = localMin<scalar>(mesh).interpolate(cellMask);
-
-                    phi *= faceMask;
-                    U   *= cellMask;
-
-                    // Make the flux relative to the mesh motion
-                    fvc::makeRelative(phi, U);
-                }
-
-                if (mesh.changing() && checkMeshCourantNo)
-                {
-                    #include "meshCourantNo.H"
-                }
-            }
-
-            #include "alphaControls.H"
-
-            surfaceScalarField rhoPhi
-            (
-                IOobject
-                (
-                    "rhoPhi",
-                    runTime.timeName(),
-                    mesh
-                ),
-                mesh,
-                dimensionedScalar(dimMass/dimTime, Zero)
-            );
-
-            mixture->correct();
-
-            #include "alphaEqnSubCycle.H"
-            const surfaceScalarField faceMask
-            (
-                localMin<scalar>(mesh).interpolate(cellMask)
-            );
-            rhoPhi *= faceMask;
-
-            interface.correct();
-
-            #include "UEqn.H"
-
-            // --- Pressure corrector loop
-            while (pimple.correct())
-            {
-                #include "pEqn.H"
-            }
-
-            if (pimple.turbCorr())
-            {
-                turbulence->correct();
-            }
-        }
-
-        runTime.write();
-
-        runTime.printExecutionTime(Info);
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
--- a/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/pEqn.H
@ -1,101 +0,0 @@
-{
-    rAU = 1.0/UEqn.A();
-    surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
-    surfaceScalarField phiHbyA
-    (
-        "phiHbyA",
-        fvc::flux(HbyA)
-    );
-
-
-    if (ddtCorr)
-    {
-        surfaceScalarField faceMaskOld
-        (
-            localMin<scalar>(mesh).interpolate(cellMask.oldTime())
-        );
-        phiHbyA += faceMaskOld*fvc::ddtCorr(U, Uf);
-    }
-
-    if (p_rgh.needReference())
-    {
-        fvc::makeRelative(phiHbyA, U);
-        adjustPhi(phiHbyA, U, p_rgh);
-        fvc::makeAbsolute(phiHbyA, U);
-    }
-
-    surfaceScalarField phig
-    (
-        (
-            interface.surfaceTensionForce()
-          - ghf*fvc::snGrad(rho)
-        )*faceMask*rAUf*mesh.magSf()
-    );
-
-    phiHbyA += phig;
-
-    // Update the pressure BCs to ensure flux consistency
-    constrainPressure(p_rgh, U, phiHbyA, rAUf);
-
-    Pair<tmp<volScalarField>> vDotP = mixture->vDotP();
-    const volScalarField& vDotcP = vDotP[0]();
-    const volScalarField& vDotvP = vDotP[1]();
-
-    while (pimple.correctNonOrthogonal())
-    {
-        fvScalarMatrix p_rghEqn
-        (
-            fvc::div(phiHbyA) - fvm::laplacian(rAUf, p_rgh)
-          - (vDotvP - vDotcP)*(mixture->pSat() - rho*gh)
-          + fvm::Sp(vDotvP - vDotcP, p_rgh)
-        );
-
-
-        //p_rghEqn.setReference(pRefCell, pRefValue);
-        p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
-
-        p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
-
-        if (pimple.finalNonOrthogonalIter())
-        {
-            phi = phiHbyA + p_rghEqn.flux();
-
-            p_rgh.relax();
-
-            U =
-                cellMask
-               *(HbyA + rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rAUf));
-
-            U.correctBoundaryConditions();
-            fvOptions.correct(U);
-        }
-    }
-
-     #include "continuityErrs.H"
-
-    {
-        Uf = fvc::interpolate(U);
-        surfaceVectorField n(mesh.Sf()/mesh.magSf());
-        Uf += n*(phi/mesh.magSf() - (n & Uf));
-    }
-
-    // Make the fluxes relative to the mesh motion
-    fvc::makeRelative(phi, U);
-
-     // Zero faces H-I for transport Eq after pEq
-    phi *= faceMask;
-
-    p == p_rgh + rho*gh;
-
-    if (p_rgh.needReference())
-    {
-        p += dimensionedScalar
-        (
-            "p",
-            p.dimensions(),
-            pRefValue - getRefCellValue(p, pRefCell)
-        );
-        p_rgh = p - rho*gh;
-    }
-}
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
@ -6,7 +6,6 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -68,23 +67,24 @@ class multiphaseMixture
 {
 public:

-    //- Symmetric pair of interface names
    class interfacePair
    :
        public Pair<word>
    {
    public:

-        // Always use symmetric hashing
-        using hasher = Pair<word>::symmHasher;
-
-        // Always use symmetric hashing (alias)
-        using hash = Pair<word>::symmHasher;
+        struct hash
+        {
+            label operator()(const interfacePair& key) const
+            {
+                return word::hash()(key.first()) + word::hash()(key.second());
+            }
+        };


        // Constructors

-            interfacePair() = default;
+            interfacePair() {} // = default

            interfacePair(const word& alpha1Name, const word& alpha2Name)
            :
@ -105,7 +105,11 @@ public:
                const interfacePair& b
            )
            {
-                return (0 != Pair<word>::compare(a, b));
+                return
+                (
+                    ((a.first() == b.first()) && (a.second() == b.second()))
+                 || ((a.first() == b.second()) && (a.second() == b.first()))
+                );
            }

            friend bool operator!=
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
@ -47,7 +47,7 @@
    }
    else if (rhoType == "field")
    {
-        rhoIO.readOpt(IOobject::MUST_READ);
+        rhoIO.readOpt() = IOobject::MUST_READ;

        rhoPtr.reset
        (
@ -102,7 +102,7 @@
    }
    else if (EType == "field")
    {
-        EHeader.readOpt(IOobject::MUST_READ);
+        EHeader.readOpt() = IOobject::MUST_READ;

        EPtr.reset
        (
@ -156,7 +156,7 @@
    }
    else if (nuType == "field")
    {
-        nuIO.readOpt(IOobject::MUST_READ);
+        nuIO.readOpt() = IOobject::MUST_READ;
        nuPtr.reset
        (
            new volScalarField
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
@ -81,7 +81,7 @@ if (thermalStress)
    }
    else if (CType == "field")
    {
-        CIO.readOpt(IOobject::MUST_READ);
+        CIO.readOpt() = IOobject::MUST_READ;

        CPtr.reset
        (
@ -136,7 +136,7 @@ if (thermalStress)
    }
    else if (kType == "field")
    {
-        rhoKIO.readOpt(IOobject::MUST_READ);
+        rhoKIO.readOpt() = IOobject::MUST_READ;

        rhoKPtr.reset
        (
@ -191,7 +191,7 @@ if (thermalStress)
    }
    else if (alphaType == "field")
    {
-        alphaIO.readOpt(IOobject::MUST_READ);
+        alphaIO.readOpt() = IOobject::MUST_READ;

        alphaPtr.reset
        (
--- a/applications/test/00-machine-sizes/Make/options
+++ b/applications/test/00-machine-sizes/Make/options
@ -1,6 +0,0 @@
-/* Disable normal project defaults */
-PROJECT_INC =
-PROJECT_LIBS =
-
-/* EXE_INC = */
-/* EXE_LIBS = */
--- a/applications/test/FixedList/Test-FixedList.C
+++ b/applications/test/FixedList/Test-FixedList.C
@ -186,14 +186,14 @@ int main(int argc, char *argv[])
        FixedList<label, 4> list1{2, 3, 4, 5};

        Info<< "list1:" << list1
-            << " hash:" << FixedList<label, 4>::hasher()(list1) << nl
+            << " hash:" << FixedList<label, 4>::Hash<>()(list1) << nl
            << " hash:" << Hash<FixedList<label, 4>>()(list1) << nl;

        label a[4] = {0, 1, 2, 3};
        FixedList<label, 4> list2(a);

        Info<< "list2:" << list2
-            << " hash:" << FixedList<label, 4>::hasher()(list2) << nl
+            << " hash:" << FixedList<label, 4>::Hash<>()(list2) << nl
            << " hash:" << Hash<FixedList<label, 4>>()(list2) << nl;


--- a/applications/test/Function1/Make/options
+++ b/applications/test/Function1/Make/options
@ -1,6 +1,15 @@
 EXE_INC = \
-    -DFULLDEBUG -g \
+    -DFULLDEBUG -g -O0 \
+    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude

 EXE_LIBS = \
-    -lmeshTools
+    -llagrangianIntermediate \
+    -lradiationModels \
+    -lregionModels \
+    -lfiniteVolume \
+    -lmeshTools \
+    -lsampling
--- a/applications/test/Function1/Test-Function1.C
+++ b/applications/test/Function1/Test-Function1.C
@ -32,8 +32,7 @@ Description

 \*---------------------------------------------------------------------------*/

-#include "argList.H"
-#include "IOstreams.H"
+#include "fvCFD.H"
 #include "Function1.H"
 #include "scalarIndList.H"
 #include "scalarField.H"
@ -41,8 +40,6 @@ Description
 #include "linearInterpolationWeights.H"
 #include "splineInterpolationWeights.H"

-using namespace Foam;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 int main(int argc, char *argv[])
--- a/applications/test/Function1/case1/constant/function1Properties
+++ b/applications/test/Function1/case1/constant/function1Properties
@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2106                                 |
+|  \\    /   O peration     | Version:  v2006                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@ -26,44 +26,11 @@ x
 );


-constant1 constant 100;
-
-table1 table
+function1 table
 (
    (0 0)(10 1)
 );

-table2
-{
-    type table;
-    values
-    (
-        (0 0)(10 1)
-    );
-}
-
-table3
-{
-    type table;
-    file "<constant>/table-values";
-}
-
-poly1 polynomial
-(
-    (0 1)
-    (1 1)
-);
-
-poly2
-{
-    type polynomial;
-    coeffs
-    (
-        (0 1)
-        (1 1)
-    );
-}
-
 function2
 {
    type        expression;
--- a/applications/test/Function1/case1/constant/table-values
+++ b/applications/test/Function1/case1/constant/table-values
@ -1,9 +0,0 @@
-// -*- C++ -*-
-// Some table values
-
-(
-    (0 0)
-    (20 1)
-);
-
-// ************************************************************************* //
--- a/applications/test/Function1/case1/system/controlDict
+++ b/applications/test/Function1/case1/system/controlDict
@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2106                                 |
+|  \\    /   O peration     | Version:  v2006                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
--- a/applications/test/HashPtrTable/Test-HashPtrTable.C
+++ b/applications/test/HashPtrTable/Test-HashPtrTable.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -125,39 +125,28 @@ int main()
    myTable.set("pi", new double(3.14159));
    myTable.set("natlog", new double(2.718282));
    myTable.insert("sqrt2", autoPtr<double>::New(1.414214));
-    myTable.insert("euler", autoPtr<double>::New(0.577216));

-    HashTable<std::unique_ptr<double>> myTable1;
+    HashTable<std::unique_ptr<double>, word, string::hash> myTable1;

    myTable1.set("abc", std::unique_ptr<double>(new double(42.1)));
    myTable1.set("pi", std::unique_ptr<double>(new double(3.14159)));
    myTable1.set("natlog", std::unique_ptr<double>(new double(2.718282)));

-    HashTable<autoPtr<double>> myTable2;
+    HashTable<autoPtr<double>, word, string::hash> myTable2;

    myTable2.set("abc", autoPtr<double>(new double(42.1)));
    myTable2.set("pi", autoPtr<double>(new double(3.14159)));
    myTable2.set("natlog", autoPtr<double>(new double(2.718282)));
    myTable2.insert("sqrt2", autoPtr<double>::New(1.414214));

-    Info<< "Initial table" << nl;
+    // Info<< myTable << endl;
    printTable(myTable);
-
-    Info<< "print" << nl;
    Info<< myTable2 << nl;

-    {
-        auto iter2 = myTable2.find("pi");
-        Info<< nl << "Got pi=";
-        if (iter2.good())
-        {
-            Info<< **iter2 << nl;
-        }
-        else
-        {
-            Info<< "not-found" << nl;
-        }
-    }
+    auto iter2 = myTable2.find("pi");
+
+    Info<<"PI: " << **iter2 << nl;
+

    HashPtrTable<double> copy(myTable);

@ -176,9 +165,6 @@ int main()
    myTable.erase("abc");
    myTable.erase("unknownKey");

-    myTable.release("euler");
-
-    Info<< "After erasure" << nl;
    printTable(myTable);

    HashPtrTable<double> moved(std::move(copy));
--- a/applications/test/HashSet/Test-hashSet.C
+++ b/applications/test/HashSet/Test-hashSet.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -80,11 +80,6 @@ void printMinMax(const HashSet<Key, Hash>& set)

 int main(int argc, char *argv[])
 {
-    Info<< "labelHashSet hasher: "
-        << typeid(labelHashSet::hasher).name() << nl
-        << "HashSet<label> hasher: "
-        << typeid(HashSet<label>::hasher).name() << nl << nl;
-
    hashedWordList words
    {
        "abc",
--- a/applications/test/Hashing/Make/files
+++ b/applications/test/Hashing/Make/files
@ -0,0 +1,3 @@
+Test-Hashing.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-Hashing
--- a/applications/test/Hashing1/Make/options
+++ b/applications/test/Hashing1/Make/options
--- a/applications/test/Hashing/Test-Hashing.C
+++ b/applications/test/Hashing/Test-Hashing.C
@ -0,0 +1,346 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2018-2020 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+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
+    testHashing
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#include "IOstreams.H"
+#include "IOobject.H"
+#include "IFstream.H"
+
+#include "stringList.H"
+#include "labelList.H"
+#include "labelPair.H"
+#include "wordPair.H"
+#include "edgeList.H"
+#include "faceList.H"
+#include "triFaceList.H"
+
+#include "Hash.H"
+
+using namespace Foam;
+
+void infoHashString
+(
+    unsigned modulus,
+    std::initializer_list<std::string> lst
+)
+{
+    if (modulus)
+    {
+        Info<< "basic string hashing (mod " << label(modulus) << ")" << nl;
+
+        for (const auto& str : lst)
+        {
+            Info<<"hash(" << str.c_str() << ")="
+                << (Hash<string>()(str) % modulus) << nl;
+        }
+
+    }
+    else
+    {
+        Info<< "basic string hashing" << nl;
+
+        for (const auto& str : lst)
+        {
+            Info<<"hash(" << str.c_str() << ")="
+                << Hash<string>()(str) << nl;
+        }
+    }
+}
+
+
+
+void reportHashList(const UList<string>& list)
+{
+    Info<< "contiguous = " << is_contiguous<string>::value << nl << nl;
+
+    for (const string& val : list)
+    {
+        unsigned hash1 = string::hash()(val);
+
+        Info<< hex << hash1 << ": " << val << nl;
+    }
+}
+
+
+void reportHashList(const UList<label>& list)
+{
+    Info<<"contiguous = " << is_contiguous<label>::value << nl << nl;
+
+    for (const label val : list)
+    {
+        // Direct value
+        unsigned hash1 = Hash<label>()(val);
+
+        // Hashed byte-wise
+        unsigned hash2 = Hash<label>()(val, 0);
+
+        Info<< hex << hash1
+            << " (seeded: " << hash2 << ")"
+            << ": " << dec << val << nl;
+    }
+}
+
+
+void reportHashList(const UList<face>& list)
+{
+    Info<<"contiguous = " << is_contiguous<label>::value << nl << nl;
+
+    for (const face& f : list)
+    {
+        // Direct value
+        unsigned hash1 = face::Hash<>()(f);
+
+        unsigned hash2 = Hash<face>()(f);
+
+        Info<< hex << "face::Hash<> " << hash1
+            << " Hash<face> " << hash2
+            << ": " << dec << flatOutput(f) << nl;
+    }
+}
+
+
+void reportHashList(const UList<labelList>& list)
+{
+    for (const labelList& val : list)
+    {
+        unsigned hash1 = Hasher
+        (
+            val.cdata(),
+            val.size() * sizeof(label)
+        );
+
+        unsigned hash2 = Hash<labelList>()(val);
+        unsigned hash2b = labelList::Hash<>()(val);
+
+        Info<< hex << hash1 << " or " << hash2
+            << "(" << hash2b << ") "
+            << ": " << dec << val << nl;
+    }
+
+    unsigned hash2 = Hash<labelListList>()(list);
+    unsigned hash2bad = HasherT(list);
+
+    Info<< hex << hash2 << " : " << dec << flatOutput(list) << nl
+        << hex << hash2bad << " as direct hash would be wrong"
+        << dec << nl;
+}
+
+
+void reportHashList(const UList<wordPair>& list)
+{
+    Info<<"contiguous = " << is_contiguous<wordPair>::value << nl << nl;
+
+    for (const wordPair& pr : list)
+    {
+        unsigned hash1 = Hash<wordPair>()(pr);
+
+        // as FixedList
+        unsigned hash2 = wordPair::Hash<>()(pr);
+
+        // as FixedList
+        unsigned hash2sym = wordPair::SymmHash<>()(pr);
+
+        // as FixedList
+        unsigned hash3 = Hash<FixedList<word,2>>()(pr);
+
+        Info<< hex << hash1 << " (as FixedList: " << hash2
+            << ") or " << hash3
+            << " symm-hash:" << hash2sym
+            << " : "<< dec << flatOutput(pr) << nl;
+    }
+}
+
+
+void reportHashList(const UList<labelPair>& list)
+{
+    Info<<"contiguous = " << is_contiguous<labelPair>::value << nl << nl;
+
+    for (const labelPair& pr : list)
+    {
+        unsigned hash1 = Hash<labelPair>()(pr);
+
+        // as FixedList
+        unsigned hash2 = labelPair::Hash<>()(pr);
+
+        // as FixedList
+        unsigned hash3 = Hash<labelPair>()(pr);
+
+        Info<< hex << hash1 << " (as FixedList: " << hash2
+            << ") or " << hash3
+            << " : "<< dec << pr << nl;
+    }
+}
+
+
+void reportHashList(const UList<labelPairPair>& list)
+{
+    Info<<"contiguous = " << is_contiguous<labelPairPair>::value << nl << nl;
+
+    for (const labelPairPair& pr : list)
+    {
+        unsigned hash1 = Hash<labelPairPair>()(pr);
+
+        // as FixedList
+        unsigned hash2 = labelPairPair::Hash<>()(pr);
+
+        // as FixedList
+        unsigned hash3 = Hash<labelPairPair>()(pr);
+
+        Info<< hex << hash1 << " (as FixedList: " << hash2
+            << ") or " << hash3
+            << " : "<< dec << pr << nl;
+    }
+}
+
+
+void reportHashList(const UList<edge>& list)
+{
+    Info<<"contiguous = " << is_contiguous<edge>::value << nl << nl;
+
+    for (const edge& e : list)
+    {
+        unsigned hash1 = Hash<edge>()(e);
+
+        // as FixedList
+        unsigned hash2 = labelPair::Hash<>()(e);
+
+        // as FixedList
+        unsigned hash3 = Hash<labelPair>()(e);
+
+        Info<< hex << hash1 << " (as FixedList: " << hash2
+            << ") or " << hash3
+            << " : "<< dec << e << nl;
+    }
+}
+
+
+void reportHashList(const UList<triFace>& list)
+{
+    Info<<"contiguous = " << is_contiguous<triFace>::value << nl << nl;
+
+    for (const triFace& f : list)
+    {
+        // direct value
+        unsigned hash1 = Hash<triFace>()(f);
+        unsigned hash2 = FixedList<label, 3>::Hash<>()(f);
+
+        Info<< hex << hash1 << " (as FixedList: " << hash2
+            << "): " << dec << f << nl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    infoHashString(8, {"asdathis1", "adsxf", "hij", "klmpq"});
+
+    IFstream is("hashingTests");
+
+    if (is.good())
+    {
+        Info<< nl << "Process " << is.name() << " file ..." << nl;
+    }
+    else
+    {
+        Info<< nl << "No " << is.name() << " file found ..." << nl;
+    }
+
+    token tok;
+
+    while (is.good() && is.read(tok) && tok.good())
+    {
+        const word listType(tok.wordToken());
+
+        Info<< nl;
+        IOobject::writeDivider(Info) << listType << nl;
+
+        if (listType == "stringList")
+        {
+            stringList list(is);
+            reportHashList(list);
+        }
+        else if (listType == "labelList")
+        {
+            labelList list(is);
+            reportHashList(list);
+        }
+        else if (listType == "faceList")
+        {
+            faceList list(is);
+            reportHashList(list);
+        }
+        else if (listType == "labelListList")
+        {
+            List<labelList> list(is);
+            reportHashList(list);
+        }
+        else if (listType == "wordPairList")
+        {
+            List<wordPair> list(is);
+            reportHashList(list);
+        }
+        else if (listType == "labelPairList")
+        {
+            labelPairList list(is);
+            reportHashList(list);
+        }
+        else if (listType == "labelPairPairList")
+        {
+            List<labelPairPair> list(is);
+            reportHashList(list);
+        }
+        else if (listType == "edgeList")
+        {
+            edgeList list(is);
+            reportHashList(list);
+        }
+        else if (listType == "triFaceList")
+        {
+            triFaceList list(is);
+            reportHashList(list);
+        }
+        else
+        {
+            Info<< "unknown type: " << listType << nl;
+        }
+    }
+
+    Info<< "\nEnd\n" << nl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
--- a/applications/test/Hashing2/hashingTests
+++ b/applications/test/Hashing2/hashingTests
@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2106                                 |
+|  \\    /   O peration     | Version:  v2006                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
--- a/applications/test/Hashing1/HashFunction.H
+++ b/applications/test/Hashing1/HashFunction.H
@ -1,224 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
-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/>.
-
-Class
-    Foam::HashFunction
-
-Description
-    Hash function class.
-
-    Verify that template overloads are properly resolved
-
-Note
-    The second template parameter (bool) is used for SFINAE overloading,
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef HashFunction_H
-#define HashFunction_H
-
-#include "Hash.H"
-
-#ifdef FULLDEBUG
-#define HashTypeInfo(Args)  void info() { std::cerr<< "" Args << "\n"; }
-#else
-#define HashTypeInfo(Args)  void info() {}
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                            Class Hash Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class T, class SFINAEType=bool>
-struct HashFun
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "default"; }
-    #endif
-    HashTypeInfo("plain hash")
-
-    unsigned operator()(const T& obj, unsigned seed=0) const
-    {
-        return Foam::Hasher(&obj, sizeof(obj), seed);
-    }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//- Hashing for label
-template<> struct HashFun<Foam::label> : Hash<label>
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "label"; }
-    #endif
-    HashTypeInfo("hash label")
-};
-
-
-//- Hashing for pointers, interpret pointer as a integer type
-template<> struct HashFun<void*> : Hash<void *>
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "pointer"; }
-    #endif
-    HashTypeInfo("hash ptr")
-};
-
-
-//- Hashing for string types
-template<class StringType>
-struct HashFun
-<
-    StringType,
-    typename std::enable_if
-    <
-        std::is_base_of<std::string, StringType>::value, bool
-    >::type
->
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "string"; }
-    #endif
-    HashTypeInfo("hash string")
-
-    unsigned operator()(const std::string& obj, unsigned seed=0) const
-    {
-        return Foam::Hasher(obj.data(), obj.size(), seed);
-    }
-};
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Various
-#include "edge.H"
-#include "face.H"
-#include "triFace.H"
-#include "Pair.H"
-#include "Tuple2.H"
-#include "DynamicList.H"
-#include "FixedList.H"
-
-namespace Foam
-{
-
-template<> struct HashFun<edge> : Hash<edge>
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "edge"; }
-    #endif
-    HashTypeInfo("hash edge")
-};
-
-
-template<> struct HashFun<face> : Hash<face>
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "face"; }
-    #endif
-    HashTypeInfo("hash face")
-};
-
-
-template<> struct HashFun<triFace> : Hash<triFace>
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "triFace"; }
-    #endif
-    HashTypeInfo("hash triFace")
-};
-
-
-template<class T>
-struct HashFun<Pair<T>> : Hash<Pair<T>>
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "Pair"; }
-    #endif
-    HashTypeInfo("hash Pair")
-};
-
-template<class T1, class T2>
-struct HashFun<Tuple2<T1, T2>> : Hash<Tuple2<T1, T2>>
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "Tuple2"; }
-    #endif
-    HashTypeInfo("hash Tuple2")
-};
-
-
-template<class T>
-struct HashFun<List<T>> : Hash<List<T>>
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "List"; }
-    #endif
-    HashTypeInfo("hash List")
-};
-
-template<class T> struct HashFun<UList<T>> : Hash<UList<T>>
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "UList"; }
-    #endif
-    HashTypeInfo("hash UList")
-};
-
-template<class T, int SizeMin>
-struct HashFun<DynamicList<T, SizeMin>> : Hash<DynamicList<T, SizeMin>>
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "DynamicList"; }
-    #endif
-    HashTypeInfo("hash DynamicList")
-};
-
-template<class T, unsigned N>
-struct HashFun<FixedList<T, N>> : Hash<FixedList<T, N>>
-{
-    #ifdef FULLDEBUG
-    static constexpr const char* name() noexcept { return "FixedList"; }
-    #endif
-    HashTypeInfo("hash FixedList")
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
--- a/applications/test/Hashing1/Make/files
+++ b/applications/test/Hashing1/Make/files
@ -1,3 +0,0 @@
-Test-Hashing1.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-Hashing1
--- a/applications/test/Hashing1/Test-Hashing1.C
+++ b/applications/test/Hashing1/Test-Hashing1.C
@ -1,163 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
-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
-    Test-Hashing1
-
-Description
-    Test/verify overloads of Hash function
-
-\*---------------------------------------------------------------------------*/
-
-#include "IOstreams.H"
-#include "IOobject.H"
-#include "IFstream.H"
-
-#include "stringList.H"
-#include "labelList.H"
-#include "labelPair.H"
-#include "wordPair.H"
-#include "edgeList.H"
-#include "faceList.H"
-#include "triFaceList.H"
-
-#define FULLDEBUG
-#include "HashFunction.H"
-
-using namespace Foam;
-
-template<class T>
-unsigned rawHasher(const T& obj)
-{
-    return Foam::Hasher(&obj, sizeof(T), 0u);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    {
-        typedef unsigned Type;
-        Type value = 100;
-
-        Info<< "hash " << typeid(value).name() << " of " << value << nl;
-        Info<< "    Hasher: " << rawHasher(value) << nl;
-        Info<< "    Hash<>: " << Hash<Type>()(value) << nl;
-    }
-    {
-        typedef int32_t Type;
-        Type value = 100;
-
-        Info<< "hash " << typeid(value).name() << " of " << value << nl;
-        Info<< "    Hasher: " << rawHasher(value) << nl;
-        Info<< "    Hash<>: " << Hash<Type>()(value) << nl;
-    }
-    {
-        typedef int64_t Type;
-        Type value = 100;
-
-        Info<< "hash " << typeid(value).name() << " of " << value << nl;
-        Info<< "    Hasher: " << rawHasher(value) << nl;
-        Info<< "    Hash<>: " << Hash<Type>()(value) << nl;
-    }
-
-    HashFun<std::string>().info();
-    HashFun<string>().info();
-    HashFun<Foam::word>().info();
-    HashFun<Foam::keyType>().info();
-
-    HashFun<int>().info();
-    HashFun<label>().info();
-    HashFun<float>().info();
-    HashFun<double>().info();
-
-    {
-        float value = 15.f;
-
-        Info<< "hash of " << Foam::name(&value)
-            << " = " << HashFun<void*>()(&value) << nl;
-    }
-
-    HashFun<labelList>().info();
-    HashFun<wordUList>().info();
-    HashFun<edge>().info();
-
-    HashFun<Pair<label>>().info();
-    HashFun<labelPair>().info();
-    HashFun<labelPairPair>().info();
-
-    HashFun<Tuple2<label, word>>().info();
-
-    {
-        typedef Tuple2<label, word> Type;
-        Type obj(10, "test");
-        Info<< obj << " hash=" << Hash<Type>()(obj) << nl;
-    }
-
-    {
-        typedef Tuple2<label, label> Type;
-        Type obj(10, 12);
-        Info<< obj << " hash=" << Hash<Type>()(obj) << nl;
-    }
-
-    {
-        typedef Pair<label> Type;
-        Type obj(10, 12);
-        Info<< obj << " hash=" << Hash<Type>()(obj) << nl;
-    }
-
-    {
-        typedef std::pair<label, label> Type;
-        Type obj(10, 12);
-        Info<< obj << " hash=" << Hash<Type>()(obj) << nl;
-
-        HashSet<Type> hs;
-        hs.insert(obj);
-        hs.erase(obj);
-    }
-
-    {
-        Pair<label>::hasher op;
-        Info<< "hasher: " << op(Pair<label>(10, 12)) << nl;
-    }
-
-    // Not supported
-    #if 0
-    {
-        Tuple2<label, label>::hasher op;
-        Info<< "hasher: " << op(Tuple2<label>(10, 12)) << nl;
-    }
-    #endif
-
-
-    Info<< "\nEnd\n" << nl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
--- a/applications/test/Hashing2/Make/files
+++ b/applications/test/Hashing2/Make/files
@ -1,3 +0,0 @@
-Test-Hashing2.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-Hashing2
--- a/applications/test/Hashing2/Make/options
+++ b/applications/test/Hashing2/Make/options
@ -1,3 +0,0 @@
-EXE_INC = ${c++LESSWARN}
-
-/* EXE_LIBS = */
--- a/applications/test/Hashing2/Test-Hashing2.C
+++ b/applications/test/Hashing2/Test-Hashing2.C
@ -1,343 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
-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
-    Test-Hashing2
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "IOstreams.H"
-#include "IOobject.H"
-#include "IFstream.H"
-
-#include "stringList.H"
-#include "labelList.H"
-#include "labelPair.H"
-#include "wordPair.H"
-#include "edgeList.H"
-#include "faceList.H"
-#include "triFaceList.H"
-
-#include "Hash.H"
-#include "HashSet.H"
-
-using namespace Foam;
-
-void infoHashString
-(
-    unsigned modulus,
-    std::initializer_list<std::string> lst
-)
-{
-    if (modulus)
-    {
-        Info<< "basic string hashing (mod " << label(modulus) << ")" << nl;
-
-        for (const auto& str : lst)
-        {
-            Info<<"hash(" << str.c_str() << ")="
-                << (Hash<string>()(str) % modulus) << nl;
-        }
-
-    }
-    else
-    {
-        Info<< "basic string hashing" << nl;
-
-        for (const auto& str : lst)
-        {
-            Info<<"hash(" << str.c_str() << ")="
-                << Hash<string>()(str) << nl;
-        }
-    }
-}
-
-
-
-void reportHashList(const UList<string>& list)
-{
-    Info<< "contiguous = " << is_contiguous<string>::value << nl << nl;
-
-    for (const string& val : list)
-    {
-        unsigned hash1 = string::hasher()(val);
-
-        Info<< hex << hash1 << ": " << val << nl;
-    }
-}
-
-
-void reportHashList(const UList<label>& list)
-{
-    Info<<"contiguous = " << is_contiguous<label>::value << nl << nl;
-
-    for (const label val : list)
-    {
-        // Direct value
-        unsigned hash1 = Hash<label>()(val);
-
-        // Hashed byte-wise
-        unsigned hash2 = Hash<label>()(val, 0);
-
-        Info<< hex << hash1
-            << " (seeded: " << hash2 << ")"
-            << ": " << dec << val << nl;
-    }
-}
-
-
-void reportHashList(const UList<face>& list)
-{
-    Info<<"contiguous = " << is_contiguous<label>::value << nl << nl;
-
-    for (const face& f : list)
-    {
-        // Direct value
-        unsigned hash1 = face::hasher()(f);
-
-        unsigned hash2 = Hash<face>()(f);
-
-        Info<< hex << "face hash " << hash1
-            << " Hash<face> " << hash2
-            << ": " << dec << flatOutput(f) << nl;
-    }
-}
-
-
-void reportHashList(const UList<labelList>& list)
-{
-    for (const labelList& val : list)
-    {
-        unsigned hash1 = Foam::Hasher(val.cdata(), val.size_bytes());
-
-        unsigned hash2 = Hash<labelList>()(val);
-        unsigned hash2b = labelList::hasher()(val);
-
-        Info<< hex << hash1 << " or " << hash2
-            << "(" << hash2b << ") "
-            << ": " << dec << val << nl;
-    }
-
-    unsigned hash2 = Hash<labelListList>()(list);
-    unsigned hash2bad = Foam::Hasher(&list, sizeof(list));
-
-    Info<< hex << hash2 << " : " << dec << flatOutput(list) << nl
-        << hex << hash2bad << " as direct hash would be wrong"
-        << dec << nl;
-}
-
-
-void reportHashList(const UList<wordPair>& list)
-{
-    Info<<"contiguous = " << is_contiguous<wordPair>::value << nl << nl;
-
-    for (const wordPair& pr : list)
-    {
-        unsigned hash1 = Hash<wordPair>()(pr);
-
-        // as FixedList
-        unsigned hash2 = wordPair::hasher()(pr);
-
-        // as FixedList
-        unsigned hash2sym = wordPair::symmHasher()(pr);
-
-        // as FixedList
-        unsigned hash3 = Hash<FixedList<word,2>>()(pr);
-
-        Info<< hex << hash1 << " (as FixedList: " << hash2
-            << ") or " << hash3
-            << " symm-hash:" << hash2sym
-            << " : "<< dec << flatOutput(pr) << nl;
-    }
-}
-
-
-void reportHashList(const UList<labelPair>& list)
-{
-    Info<<"contiguous = " << is_contiguous<labelPair>::value << nl << nl;
-
-    for (const labelPair& pr : list)
-    {
-        unsigned hash1 = Hash<labelPair>()(pr);
-
-        // as FixedList
-        unsigned hash2 = labelPair::hasher()(pr);
-
-        // as FixedList
-        unsigned hash3 = Hash<labelPair>()(pr);
-
-        Info<< hex << hash1 << " (as FixedList: " << hash2
-            << ") or " << hash3
-            << " : "<< dec << pr << nl;
-    }
-}
-
-
-void reportHashList(const UList<labelPairPair>& list)
-{
-    Info<<"contiguous = " << is_contiguous<labelPairPair>::value << nl << nl;
-
-    for (const labelPairPair& pr : list)
-    {
-        unsigned hash1 = Hash<labelPairPair>()(pr);
-
-        // as FixedList
-        unsigned hash2 = labelPairPair::hasher()(pr);
-
-        // as FixedList
-        unsigned hash3 = Hash<labelPairPair>()(pr);
-
-        Info<< hex << hash1 << " (as FixedList: " << hash2
-            << ") or " << hash3
-            << " : "<< dec << pr << nl;
-    }
-}
-
-
-void reportHashList(const UList<edge>& list)
-{
-    Info<<"contiguous = " << is_contiguous<edge>::value << nl << nl;
-
-    for (const edge& e : list)
-    {
-        unsigned hash1 = Hash<edge>()(e);
-
-        // as FixedList
-        unsigned hash2 = labelPair::hasher()(e);
-
-        // as FixedList
-        unsigned hash3 = Hash<labelPair>()(e);
-
-        Info<< hex << hash1 << " (as FixedList: " << hash2
-            << ") or " << hash3
-            << " : "<< dec << e << nl;
-    }
-}
-
-
-void reportHashList(const UList<triFace>& list)
-{
-    Info<<"contiguous = " << is_contiguous<triFace>::value << nl << nl;
-
-    for (const triFace& f : list)
-    {
-        // direct value
-        unsigned hash1 = Hash<triFace>()(f);
-        unsigned hash2 = FixedList<label, 3>::hasher()(f);
-
-        Info<< hex << hash1 << " (as FixedList: " << hash2
-            << "): " << dec << f << nl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    infoHashString(8, {"asdathis1", "adsxf", "hij", "klmpq"});
-
-    IFstream is("hashingTests");
-
-    if (is.good())
-    {
-        Info<< nl << "Process " << is.name() << " file ..." << nl;
-    }
-    else
-    {
-        Info<< nl << "No " << is.name() << " file found ..." << nl;
-    }
-
-    token tok;
-
-    while (is.good() && is.read(tok) && tok.good())
-    {
-        const word listType(tok.wordToken());
-
-        Info<< nl;
-        IOobject::writeDivider(Info) << listType << nl;
-
-        if (listType == "stringList")
-        {
-            stringList list(is);
-            reportHashList(list);
-        }
-        else if (listType == "labelList")
-        {
-            labelList list(is);
-            reportHashList(list);
-        }
-        else if (listType == "faceList")
-        {
-            faceList list(is);
-            reportHashList(list);
-        }
-        else if (listType == "labelListList")
-        {
-            List<labelList> list(is);
-            reportHashList(list);
-        }
-        else if (listType == "wordPairList")
-        {
-            List<wordPair> list(is);
-            reportHashList(list);
-        }
-        else if (listType == "labelPairList")
-        {
-            labelPairList list(is);
-            reportHashList(list);
-        }
-        else if (listType == "labelPairPairList")
-        {
-            List<labelPairPair> list(is);
-            reportHashList(list);
-        }
-        else if (listType == "edgeList")
-        {
-            edgeList list(is);
-            reportHashList(list);
-        }
-        else if (listType == "triFaceList")
-        {
-            triFaceList list(is);
-            reportHashList(list);
-        }
-        else
-        {
-            Info<< "unknown type: " << listType << nl;
-        }
-    }
-
-    Info<< "\nEnd\n" << nl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
--- a/applications/test/HashingSpeed/Test-HashingSpeed.C
+++ b/applications/test/HashingSpeed/Test-HashingSpeed.C
@ -3,8 +3,8 @@
 #include "Hasher.H"
 #include "int.H"

-#include <cstdio>
-#include <ctime>
+#include <stdio.h>
+#include <time.h>

 #ifndef CLOCKS_PER_SEC
    #ifdef CLK_TCK
@ -1048,7 +1048,7 @@ int32_t i;

 struct tagtest {
        double res;
-        const char * name;
+        char * name;
        hashFn hash;
 } tests[] = {
 //      { 0.0, "CRC32\t\t", GetCRC32                  },
--- a/applications/test/IOField/Test-IOField.C
+++ b/applications/test/IOField/Test-IOField.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -89,15 +89,15 @@ void writeAndRead
    const IOobject& io,
    const label sz,
    const word& writeType,
-    const IOobject::readOption rOpt,
+    const IOobject::readOption readOpt,
    const word& readType
 )
 {
    Pout<< "** Writing:" << writeType
        << " Reading:" << readType << endl;

-    // The write handler
-    fileHandler(fileOperation::New(writeType, true));
+    autoPtr<fileOperation> writeHandler(fileOperation::New(writeType, true));
+    fileHandler(writeHandler);

    // Delete
    Pout<< "Deleting:" << fileHandler().filePath(io.objectPath()) << endl;
@ -107,12 +107,12 @@ void writeAndRead
    Pout<< "Writing:" << fileHandler().objectPath(io, io.name()) << endl;
    doWrite<Type>(io, sz);

-    // The read handler
-    fileHandler(fileOperation::New(readType, true));
+    autoPtr<fileOperation> readHandler(fileOperation::New(readType, true));
+    fileHandler(readHandler);

    // Read
    IOobject readIO(io);
-    readIO.readOpt(rOpt);
+    readIO.readOpt() = readOpt;
    Pout<< "Reading:"
        << fileHandler().filePath(readIO.objectPath()) << endl;
    doRead<Type>(readIO, sz);
@ -130,11 +130,12 @@ void readIfPresent
    const word& readType
 )
 {
-    fileHandler(fileOperation::New(readType, true));
+    autoPtr<fileOperation> readHandler(fileOperation::New(readType, true));
+    fileHandler(readHandler);

    // Read
    Pout<< "Reading:" << fileHandler().filePath(io.objectPath()) << endl;
-    io.readOpt(IOobject::READ_IF_PRESENT);
+    io.readOpt() = IOobject::READ_IF_PRESENT;
    doRead<Type>(io, sz);
 }

@ -177,7 +178,6 @@ void doTests(IOobject& io, const label sz)

 int main(int argc, char *argv[])
 {
-    argList::noBanner();
    argList::addBoolOption("bool", "Use bool for tests");
    argList::addBoolOption("scalar", "Use scalar for tests");
    argList::addBoolOption("label", "Use label for tests (default)");
@ -209,11 +209,6 @@ int main(int argc, char *argv[])
        IOobject::NO_WRITE
    );

-    {
-        dictionary headerDict;
-        io.writeHeader(headerDict, "anything", IOstreamOption());
-        Info<< "IOobjectHeader" << headerDict << nl;
-    }

    label tested = 0;

--- a/applications/test/ITstream/Test-ITstream.C
+++ b/applications/test/ITstream/Test-ITstream.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -78,7 +78,7 @@ void printTokens(Istream& is)
        if (t.good())
        {
            ++count;
-            Info<< "token: " << t << endl;
+            Info<<"token: " << t << endl;
        }
    }

@ -86,28 +86,14 @@ void printTokens(Istream& is)
 }


-Ostream& reportPeek(const ITstream& is)
-{
-    Info<< "  index : " << is.tokenIndex() << nl
-        << "  peek  : " << is.peek().info() << nl;
-    return Info;
-}
-
-
 template<class BUF>
-void doTest
-(
-    const string& name,
-    const BUF& input,
-    bool verbose = false,
-    bool testskip = false
-)
+void doTest(const string& name, const BUF& input, bool verbose=false)
 {
-    Info<< "test " << name.c_str() << ":" << nl
-        << "====" << nl;
+    Info<<"test " << name.c_str() << ":" << nl
+        <<"====" << nl;
    toString(Info, input)
        << nl
-        << "====" << nl << endl;
+        <<"====" << nl << endl;

    ITstream its(name, input);
    Info<< "got " << its.size() << " tokens - index at "
@ -121,35 +107,6 @@ void doTest
        }
        Info<< nl;
    }
-
-    if (testskip)
-    {
-        Info<< " first : " << its.peekFirst().info() << nl
-            << " last  : " << its.peekLast().info() << nl;
-
-        Info<< "rewind():" << nl;
-        reportPeek(its);
-
-        its.skip(3);
-        Info<< "skip(3):" << nl;
-        reportPeek(its);
-
-        its.skip(2);
-        Info<< "skip(2):" << nl;
-        reportPeek(its);
-
-        its.skip(-2);
-        Info<< "skip(-2):" << nl;
-        reportPeek(its);
-
-        its.skip(100);
-        Info<< "skip(100):" << nl;
-        reportPeek(its);
-
-        its.skip(-1000);
-        Info<< "skip(-1000):" << nl;
-        reportPeek(its);
-    }
 }


@ -159,16 +116,14 @@ void doTest
 int main(int argc, char *argv[])
 {
    const char* charInput =
-        "( const char input \"string\" to tokenize )\n"
+        "( const char input \"string\" to tokenize )"
        "List<label> 5(0 1 2 3 4);";

    string stringInput("( string     ;    input \"string\" to tokenize )");

    List<char> listInput(stringInput.cbegin(), stringInput.cend());

-    doTest("empty", "", true, true);
-
-    doTest("char*", charInput, true, true);
+    doTest("char*", charInput, true);
    doTest("string", stringInput, true);
    doTest("List<char>", listInput, true);

--- a/applications/test/LabelledItem/Make/files
+++ b/applications/test/LabelledItem/Make/files
@ -1,3 +0,0 @@
-Test-LabelledItem.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-LabelledItem
--- a/applications/test/LabelledItem/Test-LabelledItem.C
+++ b/applications/test/LabelledItem/Test-LabelledItem.C
@ -1,74 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
-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/>.
-
-Description
-    Test LabelledItem (formerly 'Keyed', but that was never used)
-
-\*---------------------------------------------------------------------------*/
-
-#include "IOstreams.H"
-#include "IOobject.H"
-#include "IFstream.H"
-#include "edge.H"
-#include "LabelledItem.H"
-#include "List.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    typedef LabelledItem<edge> labelledEdge;
-
-    List<labelledEdge> edges(10);
-
-    forAll(edges, edgei)
-    {
-        auto& e = edges[edgei];
-
-        e.insert(20-edgei);
-        e.insert(edgei);
-
-        if (!(edgei % 3))
-        {
-            e.setIndex(edgei);
-        }
-    }
-
-    Info<< "edges: " << edges << nl;
-
-    Foam::sort(edges);
-
-    Info<< "sorted: " << edges << nl;
-
-    Info<< "\nEnd\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
--- a/applications/test/List/Test-List.C
+++ b/applications/test/List/Test-List.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -55,9 +55,6 @@ See also
 #include <numeric>
 #include <functional>

-// see issue #2083
-#undef Foam_constructList_from_iterators
-
 namespace Foam
 {

@ -257,12 +254,8 @@ int main(int argc, char *argv[])
    Info<< "list4: " << list4 << nl
        << "list5: " << list5 << endl;

-    #ifdef Foam_constructList_from_iterators
    List<vector> list6(list4.begin(), list4.end());
    Info<< "list6: " << list6 << endl;
-    #else
-    Info<< "NOTE: no construction from two iterators" << endl;
-    #endif

    // Subset
    const labelList map{0, 2};
@ -280,13 +273,9 @@ int main(int argc, char *argv[])
        // scalarList slist = identity(15);
        //
        // More writing, but does work:
-        #ifdef Foam_constructList_from_iterators
        scalarList slist(labelRange().begin(), labelRange(15).end());

        Info<<"scalar identity:" << flatOutput(slist) << endl;
-        #else
-        Info<<"No iterator means of creating a scalar identity list" << endl;
-        #endif

        printListOutputType<label>("labels") << nl;

@ -395,7 +384,6 @@ int main(int argc, char *argv[])
        }
        Info<< "sub-sorted: " << flatOutput(longLabelList) << nl;

-        #ifdef Foam_constructList_from_iterators
        // Construct from a label-range
        labelRange range(25,15);

@ -418,10 +406,6 @@ int main(int argc, char *argv[])
        // Even weird things like this
        List<scalar> sident4(labelRange().begin(), labelRange(8).end());
        Info<<"range-list (scalar)=" << sident4 << nl;
-        #else
-        Info<< "NOTE: no construction of labelList from range pair" << nl
-            << "use identity(...) instead" << endl;
-        #endif
    }

    wordReList reLst;
@ -674,11 +658,11 @@ int main(int argc, char *argv[])

        Info<<"hash of " << flatOutput(list1)
            << " = " << Hash<labelList>()(list1) << " or "
-            << labelList::hasher()(list1) << nl;
+            << labelList::Hash<>()(list1) << nl;

        Info<<"hash of " << flatOutput(list2) << " = "
            << Hash<labelList>()(list2) << " or "
-            << labelList::hasher()(list2) << nl;
+            << labelList::Hash<>()(list2) << nl;
    }

    return 0;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mattijs	db246431ff	BUG: mappedPatch: do not use sampleMesh. Fixes #1951 . The helper function sampleMesh returns a reference to the sampled mesh. This will fail if that mesh is on a different world.	2020-12-09 10:23:42 +00:00
sergio	979dcf696c	ENH: Adding dynamic mesh to solidFoam and tutorial	2020-12-08 15:01:32 +00:00
mattijs	73ffde539b	ENH: waterCooler: new tutorial.	2020-12-08 14:05:50 +00:00
mattijs	2c41fea031	ENH: Added new multiWorld test case	2020-12-08 14:05:50 +00:00
mattijs	04b9d1a397	ENH: Added new solidFoam solver	2020-12-08 14:05:44 +00:00
mattijs	6ac9eba5bd	ENH: mpi: use per-application communicator.	2020-12-08 14:04:43 +00:00