ENH: selection mechanism for cloudInfo function object (#2390 )

- can restrict calculation of D32 and other spray properties to a subset of parcels. Uses a predicate selection mechanism similar to vtkCloud etc.
2022-03-04 15:49:34 +01:00
12430 changed files with 79997 additions and 159024 deletions
--- a/.gitlab/issue_templates/bug.md
+++ b/.gitlab/issue_templates/bug.md
@ -49,7 +49,7 @@

 <!--
  Providing details of your set-up can help us identify any issues, e.g.
-  OpenFOAM version : v2206|v2112|v2106|v2012|v2006 etc
+  OpenFOAM version : v2112|v2106|v2012|v2006|v1912|v1906 etc
  Operating system : ubuntu|openSUSE|centos etc
  Hardware info    : any info that may help?
  Compiler         : gcc|intel|clang etc
--- a/2
+++ b/2
@ -37,7 +37,7 @@ echo
 echo ========================================
 date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
 echo "Starting compile ${WM_PROJECT_DIR##*/} ${0##*/}"
-echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler [${WM_COMPILE_CONTROL}]"
+echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler"
 echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo ========================================
 echo
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -5,8 +5,6 @@ It is likely incomplete...

 ## Contributors (alphabetical by surname)

- Tetsuo Aoyagi
- Akira Azami
 - William Bainbridge
 - Gabriel Barajas
 - Kutalmis Bercin
@ -21,7 +19,6 @@ It is likely incomplete...
 - Bernhard Gschaider
 - Andrew Heather
 - David Hill
- Yoshiaki Inoue
 - Mattijs Janssens
 - Andrew Jackson
 - Hrvoje Jasak
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@ -1,2 +1,2 @@
-api=2206
-patch=220907
+api=2112
+patch=0
--- a/README.md
+++ b/README.md
@ -40,9 +40,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-v2206 version:
+For example, for the OpenFOAM-v2112 version:
 ```
-source /installation/path/OpenFOAM-v2206/etc/bashrc
+source /installation/path/OpenFOAM-v2112/etc/bashrc
 ```

 ## Compiling OpenFOAM
@ -127,8 +127,8 @@ These 3rd-party sources are normally located in a directory parallel
 to the OpenFOAM directory. For example,
 ```
 /path/parent
-|-- OpenFOAM-v2206
-\-- ThirdParty-v2206
+|-- OpenFOAM-v2112
+\-- ThirdParty-v2112
 ```
 There are, however, many cases where this simple convention is inadequate:

@ -136,7 +136,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-sandbox2206, etc..
+  directory name, e.g. openfoam-sandbox2112, 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,9 +156,9 @@ 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*, `v2206-myCustom`,
+   * allows for an updated value of VERSION, *eg*, `v2112-myCustom`,
     without requiring a renamed ThirdParty. The API value would still
-     be `2206` and the original `ThirdParty-v2206/` would be found.
+     be `2112` and the original `ThirdParty-v2112/` would be found.
 4. PREFIX/ThirdParty-API
   * same as the previous example, but using an unadorned API value.
 5. PREFIX/ThirdParty-common
@ -213,4 +213,4 @@ ThirdParty directory will contain either an `Allwmake` file or a
 - [Governance](http://www.openfoam.com/governance/), [Governance Projects](https://www.openfoam.com/governance/projects)
 - [Contacting OpenCFD](http://www.openfoam.com/contact/)

-Copyright 2016-2022 OpenCFD Ltd
+Copyright 2016-2021 OpenCFD Ltd
--- a/applications/Allwmake
+++ b/applications/Allwmake
@ -21,10 +21,10 @@ echo ========================================

 #------------------------------------------------------------------------------

-wmake -all $targetType utilities
 wmake -all $targetType solvers
+wmake -all $targetType utilities

-# Extra tools (optional)
+# Optional
 ## wmake -all $targetType tools

 #------------------------------------------------------------------------------
--- a/applications/solvers/acoustic/acousticFoam/Make/options
+++ b/applications/solvers/acoustic/acousticFoam/Make/options
@ -11,5 +11,4 @@ EXE_LIBS = \
    -lfvOptions \
    -lmeshTools \
    -lsampling \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/combustion/PDRFoam/Make/options
+++ b/applications/solvers/combustion/PDRFoam/Make/options
@ -25,7 +25,6 @@ EXE_LIBS = \
    -lengine \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lcompressibleTransportModels \
    -lfluidThermophysicalModels \
    -lreactionThermophysicalModels \
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@ -116,7 +116,7 @@ int main(int argc, char *argv[])
            "normalisedGradP",
            tmagGradP()/max(tmagGradP())
        );
-        normalisedGradP.writeOpt(IOobject::AUTO_WRITE);
+        normalisedGradP.writeOpt() = IOobject::AUTO_WRITE;
        tmagGradP.clear();

        ++runTime;
--- a/applications/solvers/combustion/PDRFoam/setDeltaT.H
+++ b/applications/solvers/combustion/PDRFoam/setDeltaT.H
@ -36,11 +36,11 @@ Description
 if (adjustTimeStep)
 {
    scalar maxDeltaTFact = maxCo/(CoNum + StCoNum + SMALL);
-    scalar deltaTFact = Foam::min(Foam::min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);
+    scalar deltaTFact = min(min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);

    runTime.setDeltaT
    (
-        Foam::min
+        min
        (
            deltaTFact*runTime.deltaTValue(),
            maxDeltaT
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@ -19,7 +19,6 @@ EXE_LIBS = \
    -lengine \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lcompressibleTransportModels \
    -lfluidThermophysicalModels \
    -lreactionThermophysicalModels \
--- a/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options
@ -26,7 +26,6 @@ EXE_LIBS = \
    -lengine \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lcompressibleTransportModels \
    -lfluidThermophysicalModels \
    -lreactionThermophysicalModels \
--- a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options
@ -20,7 +20,6 @@ EXE_LIBS = \
    -lengine \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lcompressibleTransportModels \
    -lfluidThermophysicalModels \
    -lreactionThermophysicalModels \
--- a/applications/solvers/combustion/chemFoam/setDeltaT.H
+++ b/applications/solvers/combustion/chemFoam/setDeltaT.H
@ -1,5 +1,5 @@
 if (adjustTimeStep)
 {
-    runTime.setDeltaT(Foam::min(dtChem, maxDeltaT));
+    runTime.setDeltaT(min(dtChem, maxDeltaT));
    Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
 }
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@ -20,7 +20,6 @@ EXE_LIBS = \
    -lengine \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lcompressibleTransportModels \
    -lfluidThermophysicalModels \
    -lspecie
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@ -1,8 +1,8 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@ -34,7 +34,6 @@ EXE_LIBS = \
    -lsampling \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lspecie \
    -lcompressibleTransportModels \
    -lfluidThermophysicalModels \
--- a/applications/solvers/combustion/fireFoam/createFieldRefs.H
+++ b/applications/solvers/combustion/fireFoam/createFieldRefs.H
@ -1,4 +1,4 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
 regionModels::surfaceFilmModel& surfaceFilm = tsurfaceFilm();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);
--- a/applications/solvers/combustion/fireFoam/setMultiRegionDeltaT.H
+++ b/applications/solvers/combustion/fireFoam/setMultiRegionDeltaT.H
@ -54,9 +54,9 @@ if (adjustTimeStep)

    runTime.setDeltaT
    (
-        Foam::min
+        min
        (
-            dt0*Foam::min(Foam::min(TFactorFluid, Foam::min(TFactorFilm, TFactorSolid)), 1.2),
+            dt0*min(min(TFactorFluid, min(TFactorFilm, TFactorSolid)), 1.2),
            maxDeltaT
        )
    );
--- a/applications/solvers/combustion/reactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/Make/options
@ -19,7 +19,6 @@ EXE_LIBS = \
    -lsampling \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lreactionThermophysicalModels \
    -lspecie \
    -lcompressibleTransportModels \
--- a/applications/solvers/combustion/reactingFoam/createFieldRefs.H
+++ b/applications/solvers/combustion/reactingFoam/createFieldRefs.H
@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
@ -20,7 +20,6 @@ EXE_LIBS = \
    -lsampling \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lreactionThermophysicalModels \
    -lspecie \
    -lcompressibleTransportModels \
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFieldRefs.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFieldRefs.H
@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
@ -20,7 +20,6 @@ EXE_LIBS = \
    -lsampling \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lreactionThermophysicalModels \
    -lspecie \
    -lcompressibleTransportModels \
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFieldRefs.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFieldRefs.H
@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);
--- a/applications/solvers/compressible/rhoCentralFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/Make/options
@ -19,6 +19,5 @@ EXE_LIBS = \
    -lrhoCentralFoam \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -ldynamicFvMesh \
    -ltopoChangerFvMesh
--- a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options
@ -6,7 +6,7 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \

 EXE_LIBS = \
    -lfiniteVolume \
@ -17,5 +17,4 @@ EXE_LIBS = \
    -lfluidThermophysicalModels \
    -lspecie \
    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@ -20,11 +20,9 @@ EXE_LIBS = \
    -lspecie \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -ldynamicMesh \
    -ldynamicFvMesh \
    -ltopoChangerFvMesh \
    -lsampling \
    -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options
@ -21,7 +21,6 @@ EXE_LIBS = \
    -lspecie \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -ldynamicFvMesh \
    -ltopoChangerFvMesh \
    -loverset
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@ -19,7 +19,5 @@ EXE_LIBS = \
    -lspecie \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options
@ -21,7 +21,6 @@ EXE_LIBS = \
    -lspecie \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -ldynamicFvMesh \
    -ltopoChangerFvMesh \
    -lsampling \
--- a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createUpdatedDynamicFvMesh.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createUpdatedDynamicFvMesh.H
@ -1,52 +1,22 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+    Info<< "Create dynamic mesh for time = "
+        << runTime.timeName() << nl << endl;

-Description
-    Create a dynamicFvMesh, with init()
-
-Required Variables
-    - runTime [Time]
-
-Provided Variables
-    - mesh [dynamicFvMesh], meshPtr
-
-\*---------------------------------------------------------------------------*/
-
-Foam::autoPtr<Foam::dynamicFvMesh> meshPtr;
-
-{
-    Foam::Info << "Create dynamic mesh for time = "
-        << runTime.timeName() << Foam::nl;
-
-    meshPtr = dynamicFvMesh::New
+    autoPtr<dynamicFvMesh> meshPtr
    (
-        IOobject
+        dynamicFvMesh::New
        (
-            polyMesh::defaultRegion,
-            runTime.timeName(),
-            runTime,
-            IOobject::MUST_READ
+            IOobject
+            (
+                polyMesh::defaultRegion,
+                runTime.timeName(),
+                runTime,
+                IOobject::MUST_READ
+            )
        )
    );
-}

+    dynamicFvMesh& mesh = meshPtr();

-dynamicFvMesh& mesh = meshPtr();
-
-// Calculate initial mesh-to-mesh mapping. Note that this should be
-// done under the hood, e.g. as a MeshObject
-mesh.update();
-
-Foam::Info << Foam::endl;
-
-
-// ************************************************************************* //
+    // Calculate initial mesh-to-mesh mapping. Note that this should be
+    // done under the hood, e.g. as a MeshObject
+    mesh.update();
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
@ -18,5 +18,4 @@ EXE_LIBS = \
    -lfluidThermophysicalModels \
    -lspecie \
    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels
--- a/applications/solvers/compressible/sonicFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/Make/options
@ -16,5 +16,4 @@ EXE_LIBS = \
    -lfluidThermophysicalModels \
    -lspecie \
    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
@ -21,7 +21,6 @@ EXE_LIBS = \
    -lspecie \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -ldynamicMesh \
    -ldynamicFvMesh \
    -ltopoChangerFvMesh \
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
@ -23,10 +23,8 @@ EXE_LIBS = \
    -lspecie \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -latmosphericModels \
    -ldynamicMesh \
    -ldynamicFvMesh \
    -ltopoChangerFvMesh \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options
@ -24,7 +24,6 @@ EXE_LIBS = \
    -lspecie \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -latmosphericModels \
    -loverset \
    -ldynamicFvMesh \
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@ -20,7 +20,5 @@ EXE_LIBS = \
    -lradiationModels \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@ -37,8 +37,6 @@ EXE_LIBS = \
    -lcombustionModels \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lradiationModels \
    -lregionModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2019,2022 OpenCFD Ltd.
+    Copyright (C) 2017-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -70,7 +70,6 @@ int main(int argc, char *argv[])
    #define CREATE_MESH createMeshesPostProcess.H
    #include "postProcess.H"

-    #include "addCheckCaseOptions.H"
    #include "setRootCaseLists.H"
    #include "createTime.H"
    #include "createMeshes.H"
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
@ -30,11 +30,10 @@ EXE_LIBS = \
    -lspecie \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lradiationModels \
    -lfvOptions \
    -lfaOptions \
    -lregionModels \
    -lsampling \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
+
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2019,2022 OpenCFD Ltd.
+    Copyright (C) 2017-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -62,7 +62,6 @@ int main(int argc, char *argv[])
    #define CREATE_MESH createMeshesPostProcess.H
    #include "postProcess.H"

-    #include "addCheckCaseOptions.H"
    #include "setRootCaseLists.H"
    #include "createTime.H"
    #include "createMeshes.H"
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidMeshes.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidMeshes.H
@ -4,61 +4,21 @@

    forAll(fluidNames, i)
    {
-        if (args.dryRun() || args.found("dry-run-write"))
-        {
-            Info
-                << "Operating in 'dry-run' mode:"
-                << " case will run for 1 time step.  "
-                << "All checks assumed OK on a clean exit" << endl;
+        Info<< "Create fluid mesh for region " << fluidNames[i]
+            << " for time = " << runTime.timeName() << nl << endl;

-            FieldBase::allowConstructFromLargerSize = true;
-
-            // Create a simplified 1D mesh and attempt to re-create boundary
-            // conditions
-            fluidRegions.set
+        fluidRegions.set
+        (
+            i,
+            new fvMesh
            (
-                i,
-                new simplifiedMeshes::columnFvMesh(runTime, fluidNames[i])
-            );
-
-            // Stop after 1 iteration of the simplified mesh
-
-            if (args.found("dry-run-write"))
-            {
-                // Using saWriteNow triggers function objects execute(), write()
-                runTime.stopAt(Time::saWriteNow);
-
-                // Make sure mesh gets output to the current time (since
-                // instance no longer constant)
-                fluidRegions[i].setInstance(runTime.timeName());
-            }
-            else
-            {
-                // Using saNoWriteNow triggers function objects execute(),
-                // but not write()
-                runTime.stopAt(Time::saNoWriteNow);
-            }
-
-            functionObject::outputPrefix = "postProcessing-dry-run";
-        }
-        else
-        {
-            Info<< "Create fluid mesh for region " << fluidNames[i]
-                << " for time = " << runTime.timeName() << nl << endl;
-
-            fluidRegions.set
-            (
-                i,
-                new fvMesh
+                IOobject
                (
-                    IOobject
-                    (
-                        fluidNames[i],
-                        runTime.timeName(),
-                        runTime,
-                        IOobject::MUST_READ
-                    )
+                    fluidNames[i],
+                    runTime.timeName(),
+                    runTime,
+                    IOobject::MUST_READ
                )
-            );
-        }
+            )
+        );
    }
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/chtMultiRegionTwoPhaseEulerFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/chtMultiRegionTwoPhaseEulerFoam.C
@ -67,7 +67,6 @@ int main(int argc, char *argv[])
    #define CREATE_MESH createMeshesPostProcess.H
    #include "postProcess.H"

-    #include "addCheckCaseOptions.H"
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMeshes.H"
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/compressibleMultiRegionCourantNo.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/compressibleMultiRegionCourantNo.H
@ -18,13 +18,13 @@
            const surfaceScalarField& phi2 =
                phaseSystemFluid[regioni].phase2().phiRef();

-            sumPhi = Foam::max
+            sumPhi = max
            (
                sumPhi,
                fvc::surfaceSum(mag(phi1))().primitiveField()
            );

-            sumPhi = Foam::max
+            sumPhi = max
            (
                sumPhi,
                fvc::surfaceSum(mag(phi2))().primitiveField()
@ -43,7 +43,7 @@
              / fluidRegions[regioni].V().field()
            )*runTime.deltaTValue(),

-            CoNum = Foam::max(UrCoNum, CoNum);
+            CoNum = max(UrCoNum, CoNum);
        }
    }

--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
@ -2,7 +2,7 @@

    forAll(fluidRegions, regioni)
    {
-        CoNum = Foam::max
+        CoNum = max
        (
            compressibleCourantNo
            (
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H
@ -4,61 +4,21 @@

    forAll(fluidNames, i)
    {
-        if (args.dryRun() || args.found("dry-run-write"))
-        {
-            Info
-                << "Operating in 'dry-run' mode:"
-                << " case will run for 1 time step.  "
-                << "All checks assumed OK on a clean exit" << endl;
+        Info<< "Create fluid mesh for region " << fluidNames[i]
+            << " for time = " << runTime.timeName() << nl << endl;

-            FieldBase::allowConstructFromLargerSize = true;
-
-            // Create a simplified 1D mesh and attempt to re-create boundary
-            // conditions
-            fluidRegions.set
+        fluidRegions.set
+        (
+            i,
+            new fvMesh
            (
-                i,
-                new simplifiedMeshes::columnFvMesh(runTime, fluidNames[i])
-            );
-
-            // Stop after 1 iteration of the simplified mesh
-
-            if (args.found("dry-run-write"))
-            {
-                // Using saWriteNow triggers function objects execute(), write()
-                runTime.stopAt(Time::saWriteNow);
-
-                // Make sure mesh gets output to the current time (since
-                // instance no longer constant)
-                fluidRegions[i].setInstance(runTime.timeName());
-            }
-            else
-            {
-                // Using saNoWriteNow triggers function objects execute(),
-                // but not write()
-                runTime.stopAt(Time::saNoWriteNow);
-            }
-
-            functionObject::outputPrefix = "postProcessing-dry-run";
-        }
-        else
-        {
-            Info<< "Create fluid mesh for region " << fluidNames[i]
-                << " for time = " << runTime.timeName() << nl << endl;
-
-            fluidRegions.set
-            (
-                i,
-                new fvMesh
+                IOobject
                (
-                    IOobject
-                    (
-                        fluidNames[i],
-                        runTime.timeName(),
-                        runTime,
-                        IOobject::MUST_READ
-                    )
+                    fluidNames[i],
+                    runTime.timeName(),
+                    runTime,
+                    IOobject::MUST_READ
                )
-            );
-        }
+            )
+        );
    }
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
@ -12,15 +12,15 @@
    if (Y.size())
    {
        const word inertSpecie(thermo.get<word>("inertSpecie"));
-        inertIndex = composition.species().find(inertSpecie);
-        if (inertIndex < 0)
+        if (!composition.species().found(inertSpecie))
        {
            FatalIOErrorIn(args.executable().c_str(), thermo)
                << "Inert specie " << inertSpecie
                << " not found in available species "
-                << flatOutput(composition.species())
+                << composition.species()
                << exit(FatalIOError);
        }
+        inertIndex = composition.species()[inertSpecie];
    }

    volScalarField& rho = rhoFluid[i];
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H
@ -47,10 +47,10 @@ if (adjustTimeStep)

        runTime.setDeltaT
        (
-            Foam::min
+            min
            (
-                Foam::min(maxCo/CoNum, maxDi/DiNum)*runTime.deltaT().value(),
-                Foam::min(runTime.deltaTValue(), maxDeltaT)
+                min(maxCo/CoNum, maxDi/DiNum)*runTime.deltaT().value(),
+                min(runTime.deltaTValue(), maxDeltaT)
            )
        );
        Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setMultiRegionDeltaT.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setMultiRegionDeltaT.H
@ -49,17 +49,17 @@ if (adjustTimeStep)
    scalar maxDeltaTSolid = maxDi/(DiNum + SMALL);

    scalar deltaTFluid =
-        Foam::min
+        min
        (
-            Foam::min(maxDeltaTFluid, 1.0 + 0.1*maxDeltaTFluid),
+            min(maxDeltaTFluid, 1.0 + 0.1*maxDeltaTFluid),
            1.2
        );

    runTime.setDeltaT
    (
-        Foam::min
+        min
        (
-            Foam::min(deltaTFluid, maxDeltaTSolid)*runTime.deltaT().value(),
+            min(deltaTFluid, maxDeltaTSolid)*runTime.deltaT().value(),
            maxDeltaT
        )
    );
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@ -35,7 +35,7 @@
                (
                    solidRegions[i],
                    thermos[i],
-                    coordinateSystem::typeName
+                    coordinateSystem::typeName_()
                )
            );

--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidMeshes.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidMeshes.H
@ -4,67 +4,26 @@

    forAll(solidNames, i)
    {
-        if (args.dryRun() || args.found("dry-run-write"))
-        {
-            Info
-                << "Operating in 'dry-run' mode:"
-                << " case will run for 1 time step.  "
-                << "All checks assumed OK on a clean exit" << endl;
+        Info<< "Create solid mesh for region " << solidNames[i]
+            << " for time = " << runTime.timeName() << nl << endl;

-            FieldBase::allowConstructFromLargerSize = true;
-
-            // Create a simplified 1D mesh and attempt to re-create boundary
-            // conditions
-            solidRegions.set
+        solidRegions.set
+        (
+            i,
+            new fvMesh
            (
-                i,
-                new simplifiedMeshes::columnFvMesh(runTime, solidNames[i])
-            );
-
-            // Stop after 1 iteration of the simplified mesh
-
-            if (args.found("dry-run-write"))
-            {
-                // Using saWriteNow triggers function objects execute(), write()
-                runTime.stopAt(Time::saWriteNow);
-
-                // Make sure mesh gets output to the current time (since
-                // instance no longer constant)
-                solidRegions[i].setInstance(runTime.timeName());
-            }
-            else
-            {
-                // Using saNoWriteNow triggers function objects execute(),
-                // but not write()
-                runTime.stopAt(Time::saNoWriteNow);
-            }
-
-            functionObject::outputPrefix = "postProcessing-dry-run";
-        }
-        else
-        {
-            Info<< "Create solid mesh for region " << solidNames[i]
-                << " for time = " << runTime.timeName() << nl << endl;
-
-            solidRegions.set
-            (
-                i,
-                new fvMesh
+                IOobject
                (
-                    IOobject
-                    (
-                        solidNames[i],
-                        runTime.timeName(),
-                        runTime,
-                        IOobject::MUST_READ
-                    )
+                    solidNames[i],
+                    runTime.timeName(),
+                    runTime,
+                    IOobject::MUST_READ
                )
-            );
+            )
+        );

-            // Force calculation of geometric properties to prevent it being
-            // done
-            // later in e.g. some boundary evaluation
-            //(void)solidRegions[i].weights();
-            //(void)solidRegions[i].deltaCoeffs();
-        }
+        // Force calculation of geometric properties to prevent it being done
+        // later in e.g. some boundary evaluation
+        //(void)solidRegions[i].weights();
+        //(void)solidRegions[i].deltaCoeffs();
    }
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H
@ -22,7 +22,7 @@ forAll(solidRegions, i)
    tmp<volScalarField> trho = thermo.rho();
    const volScalarField& rho = trho();

-    DiNum = Foam::max
+    DiNum = max
    (
        solidRegionDiffNo
        (
--- a/applications/solvers/heatTransfer/solidFoam/Make/files
+++ b/applications/solvers/heatTransfer/solidFoam/Make/files
@ -1,4 +1,3 @@
-solidRegionDiffNo.C
 solidFoam.C

 EXE = $(FOAM_APPBIN)/solidFoam
--- a/applications/solvers/heatTransfer/solidFoam/Make/options
+++ b/applications/solvers/heatTransfer/solidFoam/Make/options
@ -1,6 +1,4 @@
 EXE_INC = \
-    -I../chtMultiRegionFoam/include \
-    -I../chtMultiRegionFoam/solid \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
@ -23,5 +21,4 @@ EXE_LIBS = \
    -lfluidThermophysicalModels \
    -lsolidThermo \
    -lradiationModels \
-    -lspecie \
-    -lthermoTools
+    -lspecie
--- a/applications/solvers/heatTransfer/solidFoam/createFields.H
+++ b/applications/solvers/heatTransfer/solidFoam/createFields.H
@ -15,7 +15,7 @@ if (!thermo.isotropic())
    (
        mesh,
        thermo,
-        coordinateSystem::typeName
+        coordinateSystem::typeName_()
    );

    tmp<volVectorField> tkappaByCp = thermo.Kappa()/thermo.Cp();
--- a/applications/solvers/heatTransfer/solidFoam/solidDiffusionNo.H
+++ b/applications/solvers/heatTransfer/solidFoam/solidDiffusionNo.H
@ -1,31 +0,0 @@
-scalar DiNum = -GREAT;
-
-{
-    tmp<volScalarField> magKappa;
-    if (thermo.isotropic())
-    {
-        magKappa = thermo.kappa();
-    }
-    else
-    {
-        magKappa = mag(thermo.Kappa());
-    }
-
-    tmp<volScalarField> tcp = thermo.Cp();
-    const volScalarField& cp = tcp();
-
-    tmp<volScalarField> trho = thermo.rho();
-    const volScalarField& rho = trho();
-
-    DiNum = Foam::max
-    (
-        solidRegionDiffNo
-        (
-            mesh,
-            runTime,
-            rho*cp,
-            magKappa()
-        ),
-        DiNum
-    );
-}
--- a/applications/solvers/heatTransfer/solidFoam/solidFoam.C
+++ b/applications/solvers/heatTransfer/solidFoam/solidFoam.C
@ -41,8 +41,6 @@ Description
 #include "fvOptions.H"
 #include "simpleControl.H"
 #include "pimpleControl.H"
-#include "dummyCourantNo.H"
-#include "solidRegionDiffNo.H"
 #include "coordinateSystem.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -90,31 +88,17 @@ int main(int argc, char *argv[])
    {
        pimpleControl pimple(mesh);

-        #include "createDyMControls.H"
-
        while (runTime.run())
        {
-            #include "readDyMControls.H"
-            #include "readSolidTimeControls.H"
-
-            #include "solidDiffusionNo.H"
-            #include "setMultiRegionDeltaT.H"
-
            ++runTime;

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

            while (pimple.loop())
            {
-                if (pimple.firstIter() || moveMeshOuterCorrectors)
+                if (pimple.firstIter())
                {
-                    // Do any mesh changes
-                    mesh.controlledUpdate();
-
-                    if (mesh.changing() && checkMeshCourantNo)
-                    {
-                        #include "meshCourantNo.H"
-                    }
+                    mesh.update();
                }

                while (pimple.correct())
--- a/applications/solvers/heatTransfer/solidFoam/solidRegionDiffNo.C
+++ b/applications/solvers/heatTransfer/solidFoam/solidRegionDiffNo.C
@ -1 +0,0 @@
-../chtMultiRegionFoam/solid/solidRegionDiffNo.C
--- a/applications/solvers/heatTransfer/solidFoam/solidRegionDiffNo.H
+++ b/applications/solvers/heatTransfer/solidFoam/solidRegionDiffNo.H
@ -1 +0,0 @@
-../chtMultiRegionFoam/solid/solidRegionDiffNo.H
--- a/applications/solvers/heatTransfer/thermoFoam/Make/options
+++ b/applications/solvers/heatTransfer/thermoFoam/Make/options
@ -18,5 +18,4 @@ EXE_LIBS = \
    -lradiationModels \
    -lspecie \
    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels
--- a/applications/solvers/incompressible/adjointOptimisationFoam/adjointOptimisationFoam.C
+++ b/applications/solvers/incompressible/adjointOptimisationFoam/adjointOptimisationFoam.C
@ -5,8 +5,8 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2007-2021 PCOpt/NTUA
-    Copyright (C) 2013-2021 FOSS GP
+    Copyright (C) 2007-2019 PCOpt/NTUA
+    Copyright (C) 2013-2019 FOSS GP
    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@ -71,6 +71,9 @@ int main(int argc, char *argv[])

        // Solve all adjoint equations
        om.solveAdjointEquations();
+
+        // Compute all sensitivities
+        om.computeSensitivities();
    }

    Info<< "End\n" << endl;
--- a/applications/solvers/incompressible/pimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/Make/options
@ -22,5 +22,4 @@ EXE_LIBS = \
    -ldynamicFvMesh \
    -ltopoChangerFvMesh \
    -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/incompressible/shallowWaterFoam/createFields.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/createFields.H
@ -20,7 +20,7 @@ volScalarField h0
    IOobject
    (
        "h0",
-        runTime.findInstance(polyMesh::meshSubDir, "points"),
+        runTime.findInstance("polyMesh", "points"),
        mesh,
        IOobject::READ_IF_PRESENT
    ),
--- a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createUpdatedDynamicFvMesh.H
+++ b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createUpdatedDynamicFvMesh.H
@ -1,52 +1,22 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+    Info<< "Create dynamic mesh for time = "
+        << runTime.timeName() << nl << endl;

-Description
-    Create a dynamicFvMesh, with init()
-
-Required Variables
-    - runTime [Time]
-
-Provided Variables
-    - mesh [dynamicFvMesh], meshPtr
-
-\*---------------------------------------------------------------------------*/
-
-Foam::autoPtr<Foam::dynamicFvMesh> meshPtr;
-
-{
-    Foam::Info << "Create dynamic mesh for time = "
-        << runTime.timeName() << Foam::nl;
-
-    meshPtr = dynamicFvMesh::New
+    autoPtr<dynamicFvMesh> meshPtr
    (
-        IOobject
+        dynamicFvMesh::New
        (
-            polyMesh::defaultRegion,
-            runTime.timeName(),
-            runTime,
-            IOobject::MUST_READ
+            IOobject
+            (
+                polyMesh::defaultRegion,
+                runTime.timeName(),
+                runTime,
+                IOobject::MUST_READ
+            )
        )
    );
-}

+    dynamicFvMesh& mesh = meshPtr();

-dynamicFvMesh& mesh = meshPtr();
-
-// Calculate initial mesh-to-mesh mapping. Note that this should be
-// done under the hood, e.g. as a MeshObject
-mesh.update();
-
-Foam::Info << Foam::endl;
-
-
-// ************************************************************************* //
+    // Calculate initial mesh-to-mesh mapping. Note that this should be
+    // done under the hood, e.g. as a MeshObject
+    mesh.update();
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@ -31,7 +31,6 @@ EXE_LIBS = \
    -lmeshTools \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -llagrangian \
    -llagrangianIntermediate \
    -llagrangianTurbulence \
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H
@ -1,4 +1,4 @@
 const volScalarField& T = thermo.T();
 const volScalarField& psi = thermo.psi();

-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@ -2,10 +2,10 @@ EXE_INC = \
    -I../reactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@ -36,7 +36,6 @@ EXE_LIBS = \
    -lsampling \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lspecie \
    -lcompressibleTransportModels \
    -lfluidThermophysicalModels \
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H
@ -1,4 +1,4 @@
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);

 const volScalarField& T = thermo.T();
 const volScalarField& psi = thermo.psi();
--- a/applications/solvers/lagrangian/reactingParcelFoam/createMeshesPostProcess.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createMeshesPostProcess.H
@ -1,35 +1,27 @@
 #include "createMesh.H"

-dictionary filmDict;
-
-IOobject io
+IOdictionary filmDict
 (
-    "surfaceFilmProperties",
-    mesh.time().constant(),
-    mesh,
-    IOobject::READ_IF_PRESENT,
-    IOobject::NO_WRITE,
-    false
+    IOobject
+    (
+        "surfaceFilmProperties",
+        runTime.constant(),
+        runTime,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    )
 );

-if (io.typeHeaderOk<IOdictionary>())
-{
-    IOdictionary propDict(io);
+const word filmRegionName = filmDict.get<word>("region");

-    filmDict = std::move(propDict);
-
-    const word filmRegionName = filmDict.get<word>("region");
-
-    fvMesh filmMesh
+fvMesh filmMesh
+(
+    IOobject
    (
-        IOobject
-        (
-            filmRegionName,
-            runTime.timeName(),
-            runTime,
-            IOobject::MUST_READ
-        )
-    );
-}
-
-
+        filmRegionName,
+        runTime.timeName(),
+        runTime,
+        IOobject::MUST_READ
+    )
+);
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
@ -2,8 +2,8 @@ EXE_INC = \
    -I.. \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/meshTools/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 \
@ -36,7 +36,6 @@ EXE_LIBS = \
    -ldynamicFvMesh \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lspecie \
    -lcompressibleTransportModels \
    -lfluidThermophysicalModels \
--- a/applications/solvers/lagrangian/reactingParcelFoam/setMultiRegionDeltaT.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/setMultiRegionDeltaT.H
@ -36,13 +36,13 @@ Description
 if (adjustTimeStep)
 {
    const scalar maxDeltaTFact =
-        Foam::min(maxCo/(CoNum + SMALL), maxCo/(surfaceFilm.CourantNumber() + SMALL));
+        min(maxCo/(CoNum + SMALL), maxCo/(surfaceFilm.CourantNumber() + SMALL));
    const scalar deltaTFact =
-        Foam::min(Foam::min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);
+        min(min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);

    runTime.setDeltaT
    (
-        Foam::min
+        min
        (
            deltaTFact*runTime.deltaTValue(),
            maxDeltaT
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
@ -31,7 +31,6 @@ EXE_LIBS = \
    -lmeshTools \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -llagrangian \
    -llagrangianIntermediate \
    -llagrangianTurbulence \
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFieldRefs.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFieldRefs.H
@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);
--- a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
@ -2,7 +2,7 @@ EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
    -I$(LIB_SRC)/fvOptions/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@ -31,7 +31,6 @@ EXE_LIBS = \
    -lmeshTools \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -llagrangian \
    -llagrangianIntermediate \
    -llagrangianTurbulence \
--- a/applications/solvers/lagrangian/simpleCoalParcelFoam/createFieldRefs.H
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/createFieldRefs.H
@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@ -2,8 +2,8 @@ EXE_INC = \
    -I../reactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@ -31,7 +31,6 @@ EXE_LIBS = \
    -lmeshTools \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -llagrangian \
    -llagrangianIntermediate \
    -llagrangianTurbulence \
--- a/applications/solvers/lagrangian/sprayFoam/createFieldRefs.H
+++ b/applications/solvers/lagrangian/sprayFoam/createFieldRefs.H
@ -1,3 +1,3 @@
 const volScalarField& T = thermo.T();
 const volScalarField& psi = thermo.psi();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);
--- a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
@ -4,8 +4,8 @@ EXE_INC = \
    -I../../reactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@ -35,7 +35,6 @@ EXE_LIBS = \
    -lsampling \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -llagrangian \
    -llagrangianIntermediate \
    -llagrangianTurbulence \
--- a/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
@ -2,7 +2,7 @@ EXE_INC = \
    -I$(FOAM_SOLVERS)/lagrangian/reactingParcelFoam/simpleReactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
@ -31,7 +31,6 @@ EXE_LIBS = \
    -lmeshTools \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -llagrangian \
    -llagrangianIntermediate \
    -llagrangianSpray \
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
@ -4,8 +4,8 @@ EXE_INC = \
    -I../../../compressible/rhoPimpleFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@ -36,7 +36,6 @@ EXE_LIBS = \
    -lmeshTools \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -llagrangian \
    -llagrangianIntermediate \
    -llagrangianTurbulence \
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
@ -29,7 +29,6 @@ EXE_LIBS = \
    -lradiationModels \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lregionModels \
    -lsurfaceFilmModels \
    -lregionFaModels \
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options
@ -32,7 +32,6 @@ EXE_LIBS = \
    -lradiationModels \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lregionModels \
    -lsurfaceFilmModels \
    -ldynamicMesh \
--- a/applications/solvers/multiphase/MPPICInterFoam/Make/options
+++ b/applications/solvers/multiphase/MPPICInterFoam/Make/options
@ -35,12 +35,10 @@ EXE_LIBS = \
    -lspecie \
    -lincompressibleTransportModels \
    -limmiscibleIncompressibleTwoPhaseMixture \
-    -ltwoPhaseProperties \
    -linterfaceProperties \
    -lturbulenceModels \
    -lsampling \
    -lregionModels \
-    -lregionFaModels \
    -lsurfaceFilmModels \
-    -lfiniteArea \
    -lcompressibleTwoPhaseMixtureTurbulenceModels
+
--- a/applications/solvers/multiphase/MPPICInterFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/MPPICInterFoam/alphaEqn.H
@ -214,7 +214,7 @@
                phiCN,
                alphaPhi10,
                Sp,
-                (Su + divU*Foam::min(alpha1(), scalar(1)))(),
+                (Su + divU*min(alpha1(), scalar(1)))(),
                oneField(),
                zeroField()
            );
--- a/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options
@ -19,9 +19,7 @@ LIB_LIBS = \
    -lmeshTools \
    -lincompressibleTransportModels \
    -limmiscibleIncompressibleTwoPhaseMixture \
-    -ltwoPhaseProperties \
    -linterfaceProperties \
    -lturbulenceModels \
    -lincompressibleTurbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels
--- a/applications/solvers/multiphase/VoF/alphaEqn.H
+++ b/applications/solvers/multiphase/VoF/alphaEqn.H
@ -214,7 +214,7 @@
                phiCN,
                alphaPhi10,
                Sp,
-                (Su + divU*Foam::min(alpha1(), scalar(1)))(),
+                (Su + divU*min(alpha1(), scalar(1)))(),
                oneField(),
                zeroField()
            );
--- a/applications/solvers/multiphase/VoF/setDeltaT.H
+++ b/applications/solvers/multiphase/VoF/setDeltaT.H
@ -36,13 +36,13 @@ Description
 if (adjustTimeStep)
 {
    scalar maxDeltaTFact =
-        Foam::min(maxCo/(CoNum + SMALL), maxAlphaCo/(alphaCoNum + SMALL));
+        min(maxCo/(CoNum + SMALL), maxAlphaCo/(alphaCoNum + SMALL));

-    scalar deltaTFact = Foam::min(Foam::min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);
+    scalar deltaTFact = min(min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);

    runTime.setDeltaT
    (
-        Foam::min
+        min
        (
            deltaTFact*runTime.deltaTValue(),
            maxDeltaT
--- a/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H
+++ b/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H
@ -36,13 +36,13 @@ Description
 if (adjustTimeStep)
 {
    scalar maxDeltaTFact =
-        Foam::min(maxCo/(CoNum + SMALL), maxAcousticCo/(acousticCoNum + SMALL));
+        min(maxCo/(CoNum + SMALL), maxAcousticCo/(acousticCoNum + SMALL));

-    scalar deltaTFact = Foam::min(Foam::min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);
+    scalar deltaTFact = min(min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);

    runTime.setDeltaT
    (
-        Foam::min
+        min
        (
            deltaTFact*runTime.deltaTValue(),
            maxDeltaT
--- a/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
+++ b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
@ -37,11 +37,11 @@ if (adjustTimeStep)
    if (CoNum > SMALL)
    {
        scalar maxDeltaTFact =
-            Foam::min(maxCo/(CoNum + SMALL), maxAcousticCo/(acousticCoNum + SMALL));
+            min(maxCo/(CoNum + SMALL), maxAcousticCo/(acousticCoNum + SMALL));

        runTime.setDeltaT
        (
-            Foam::min
+            min
            (
                maxDeltaTFact*runTime.deltaTValue(),
                maxDeltaT
--- a/applications/solvers/multiphase/compressibleInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options
@ -26,5 +26,4 @@ EXE_LIBS = \
    -linterfaceProperties \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lVoFphaseCompressibleTurbulenceModels
--- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options
@ -1,18 +1,16 @@
 EXE_INC = \
    -I../twoPhaseMixtureThermo \
-    -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/compressible/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
+    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude

 LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
    -ltwoPhaseMixtureThermo \
    -lcompressibleTransportModels \
    -lfluidThermophysicalModels \
@ -22,5 +20,6 @@ LIB_LIBS = \
    -linterfaceProperties \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
-    -lincompressibleTransportModels
+    -lincompressibleTransportModels \
+    -lfiniteVolume \
+    -lmeshTools
--- a/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H
@ -26,12 +26,12 @@ forAll(dgdt, celli)
 {
    if (dgdt[celli] > 0.0)
    {
-        Sp[celli] -= dgdt[celli]/Foam::max(1.0 - alpha1[celli], 1e-4);
-        Su[celli] += dgdt[celli]/Foam::max(1.0 - alpha1[celli], 1e-4);
+        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]/Foam::max(alpha1[celli], 1e-4);
+        Sp[celli] += dgdt[celli]/max(alpha1[celli], 1e-4);
    }
 }

--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
@ -29,7 +29,6 @@ EXE_LIBS = \
    -linterfaceProperties \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lVoFphaseCompressibleTurbulenceModels \
    -ldynamicMesh \
    -ldynamicFvMesh
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options
@ -36,7 +36,6 @@ EXE_LIBS = \
    -linterfaceProperties \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lVoFphaseCompressibleTurbulenceModels \
    -lSLGThermo \
    -lsurfaceFilmModels \
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
@ -26,7 +26,6 @@ EXE_LIBS = \
    -ldynamicMesh \
    -ldynamicFvMesh \
    -ltwoPhaseMixtureThermo \
-    -ltwoPhaseProperties \
    -ltwoPhaseSurfaceTension \
    -lcompressibleTransportModels \
    -lfluidThermophysicalModels \
@ -36,6 +35,5 @@ EXE_LIBS = \
    -linterfaceProperties \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lVoFphaseCompressibleTurbulenceModels \
    -lgeometricVoF
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaEqn.H
@ -1,6 +1,6 @@
 // Update alpha1
 #include "alphaSuSp.H"
-advector.advect(Sp,(Su + divU*Foam::min(alpha1(), scalar(1)))());
+advector.advect(Sp,(Su + divU*min(alpha1(), scalar(1)))());

 // Update rhoPhi
 rhoPhi = advector.getRhoPhi(rho1, rho2);
@ -10,6 +10,6 @@ alpha2 = 1.0 - alpha1;

 Info<< "Phase-1 volume fraction = "
    << alpha1.weightedAverage(mesh.Vsc()).value()
-    << "  Min(" << alpha1.name() << ") = " << Foam::min(alpha1).value()
-    << "  Max(" << alpha1.name() << ") - 1 = " << Foam::max(alpha1).value() - 1
+    << "  Min(" << alpha1.name() << ") = " << min(alpha1).value()
+    << "  Max(" << alpha1.name() << ") - 1 = " << max(alpha1).value() - 1
    << endl;
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaSuSp.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaSuSp.H
@ -26,12 +26,12 @@ forAll(dgdt, celli)
 {
    if (dgdt[celli] > 0.0)
    {
-        Sp[celli] -= dgdt[celli]/Foam::max(1.0 - alpha1[celli], 1e-4);
-        Su[celli] += dgdt[celli]/Foam::max(1.0 - alpha1[celli], 1e-4);
+        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]/Foam::max(alpha1[celli], 1e-4);
+        Sp[celli] += dgdt[celli]/max(alpha1[celli], 1e-4);
    }
 }

--- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options
@ -32,7 +32,6 @@ EXE_LIBS = \
    -linterfaceProperties \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
-    -lthermoTools \
    -lVoFphaseCompressibleTurbulenceModels \
    -ldynamicMesh \
    -ldynamicFvMesh \
--- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/alphaSuSp.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/alphaSuSp.H
@ -26,12 +26,12 @@ forAll(dgdt, celli)
 {
    if (dgdt[celli] > 0.0)
    {
-        Sp[celli] -= dgdt[celli]/Foam::max(1.0 - alpha1[celli], 1e-4);
-        Su[celli] += dgdt[celli]/Foam::max(1.0 - alpha1[celli], 1e-4);
+        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]/Foam::max(alpha1[celli], 1e-4);
+        Sp[celli] += dgdt[celli]/max(alpha1[celli], 1e-4);
    }
 }

--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
@ -21,5 +21,4 @@ EXE_LIBS = \
    -lspecie \
    -linterfaceProperties \
    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`../chtMultiRegionFoam/solid/solidRegionDiffNo.C`