Replaced all integer variables with labels, and all std containers with the corresponding OpenFOAM containers.

.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 : v2306|v2212|v2206|v2112|v2106 etc
+  OpenFOAM version : v2212|v2206|v2112|v2106|v2012 etc
   Operating system : ubuntu|openSUSE|centos etc
   Hardware info    : any info that may help?
   Compiler         : gcc|intel|clang etc

Allwmake

@@ -96,12 +96,10 @@ echo "  ${WM_PROJECT_DIR##*/}"
 echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler"
 echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo
-
-# The api/patch information
-sed -e 's/^/  /; s/=/ = /' ./META-INFO/api-info 2>/dev/null || true
-
-echo "  bin = $(_foamCountDirEntries "$FOAM_APPBIN") entries"
-echo "  lib = $(_foamCountDirEntries "$FOAM_LIBBIN") entries"
+echo "  api   = $(etc/openfoam -show-api 2>/dev/null)"
+echo "  patch = $(etc/openfoam -show-patch 2>/dev/null)"
+echo "  bin   = $(_foamCountDirEntries "$FOAM_APPBIN") entries"
+echo "  lib   = $(_foamCountDirEntries "$FOAM_LIBBIN") entries"
 echo
 echo ========================================
 

CONTRIBUTORS.md

@@ -5,22 +5,17 @@ It is likely incomplete...
 
 ## Contributors (alphabetical by surname)
 
-- Horacio Aguerre
-- Yu Ankun
 - Tetsuo Aoyagi
 - Akira Azami
 - William Bainbridge
 - Gabriel Barajas
 - Kutalmis Bercin
-- Julius Bergmann
 - Ivor Clifford
 - Greg Collecutt
 - Jonathan Cranford
-- Santiago Marquez Damian
 - Sergio Ferraris
 - Matej Forman
 - Marian Fuchs
-- Gabriel Gerlero
 - Pawan Ghildiyal
 - Chris Greenshields
 - Bernhard Gschaider
@@ -55,11 +50,8 @@ It is likely incomplete...
 - Gavin Tabor
 - Zeljko Tukovic
 - Eugene De Villiers
-- Louis Vittoz
-- Vuko Vukcevic
 - Yi Wang
 - Norbert Weber
-- Volker Weissmann
 - Henry Weller
 - Niklas Wikstrom
 - Guanyang Xue

META-INFO/api-info

@@ -1,2 +1,2 @@
-api=2306
-patch=0
+api=2212
+patch=230110

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-v2306 version:
+For example, for the OpenFOAM-v2212 version:
 ```
-source /installation/path/OpenFOAM-v2306/etc/bashrc
+source /installation/path/OpenFOAM-v2212/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-v2306
-\-- ThirdParty-v2306
+|-- OpenFOAM-v2212
+\-- ThirdParty-v2212
 ```
 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-sandbox2306, etc..
+  directory name, e.g. openfoam-sandbox2212, 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*, `v2306-myCustom`,
+   * allows for an updated value of VERSION, *eg*, `v2212-myCustom`,
      without requiring a renamed ThirdParty. The API value would still
-     be `2306` and the original `ThirdParty-v2306/` would be found.
+     be `2212` and the original `ThirdParty-v2212/` would be found.
 4. PREFIX/ThirdParty-API
    * same as the previous example, but using an unadorned API value.
 5. PREFIX/ThirdParty-common

applications/meson.build

@@ -1,4 +0,0 @@
-subdir('solvers')
-subdir('test')
-subdir('tools')
-subdir('utilities')

applications/solvers/DNS/dnsFoam/meson.build

@@ -1,32 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'dnsFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_meshTools,
-    lib_randomProcesses,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/DNS/dnsFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/randomProcesses',
-    '-I' + recursive_include_dirs / 'applications/solvers/DNS/dnsFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_dnsFoam = executable(
-    'dnsFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/DNS/meson.build

@@ -1 +0,0 @@
-subdir('dnsFoam')

applications/solvers/acoustic/acousticFoam/meson.build

@@ -1,37 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'acousticFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_regionFaModels,
-    lib_finiteArea,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/acoustic/acousticFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/regionFaModels',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'applications/solvers/acoustic/acousticFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_acousticFoam = executable(
-    'acousticFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/acoustic/acousticFoam/readTransportProperties.H

@@ -18,6 +18,6 @@ dimensionedScalar rho("rho", dimDensity, transportProperties);
 
 scalar MaxCo =
     max(mesh.surfaceInterpolation::deltaCoeffs()*c0).value()
-   *runTime.deltaTValue();
+   *runTime.deltaT().value();
 
 Info<< "Max acoustic Courant Number = " << MaxCo << endl;

applications/solvers/acoustic/meson.build

@@ -1 +0,0 @@
-subdir('acousticFoam')

applications/solvers/basic/laplacianFoam/meson.build

@@ -1,33 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'laplacianFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/basic/laplacianFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'applications/solvers/basic/laplacianFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_laplacianFoam = executable(
-    'laplacianFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)
-
-subdir('overLaplacianDyMFoam')

applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/meson.build

@@ -1,35 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'overLaplacianDyMFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_meshTools,
-    lib_dynamicFvMesh,
-    lib_overset,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'src/overset',
-    '-I' + recursive_include_dirs / 'src/overset/include',
-    '-I' + recursive_include_dirs / 'applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_overLaplacianDyMFoam = executable(
-    'overLaplacianDyMFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/basic/meson.build

@@ -1,3 +0,0 @@
-subdir('laplacianFoam')
-subdir('potentialFoam')
-subdir('scalarTransportFoam')

applications/solvers/basic/potentialFoam/meson.build

@@ -1,34 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'potentialFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_meshTools,
-    lib_sampling,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/basic/potentialFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'applications/solvers/basic/potentialFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_potentialFoam = executable(
-    'potentialFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)
-
-subdir('overPotentialFoam')

applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H

@@ -1,4 +1,125 @@
-#include "../createFields.H"
+Info<< "Reading velocity field U\n" << endl;
+volVectorField U
+(
+    IOobject
+    (
+        "U",
+        runTime.timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::AUTO_WRITE
+    ),
+    mesh
+);
+
+// Initialise the velocity internal field to zero
+U = dimensionedVector(U.dimensions(), Zero);
+
+surfaceScalarField phi
+(
+    IOobject
+    (
+        "phi",
+        runTime.timeName(),
+        mesh,
+        IOobject::NO_READ,
+        IOobject::AUTO_WRITE
+    ),
+    fvc::flux(U)
+);
+
+if (args.found("initialiseUBCs"))
+{
+    U.correctBoundaryConditions();
+    phi = fvc::flux(U);
+}
+
+
+// Construct a pressure field
+// If it is available read it otherwise construct from the velocity BCs
+// converting fixed-value BCs to zero-gradient and vice versa.
+
+// Allow override from command-line -pName option
+const word pName = args.getOrDefault<word>("pName", "p");
+
+// Infer the pressure BCs from the velocity
+wordList pBCTypes
+(
+    U.boundaryField().size(),
+    fixedValueFvPatchScalarField::typeName
+);
+
+forAll(U.boundaryField(), patchi)
+{
+    if (U.boundaryField()[patchi].fixesValue())
+    {
+        pBCTypes[patchi] = zeroGradientFvPatchScalarField::typeName;
+    }
+}
+
+// Note that registerObject is false for the pressure field. The pressure
+// field in this solver doesn't have a physical value during the solution.
+// It shouldn't be looked up and used by sub models or boundary conditions.
+Info<< "Constructing pressure field " << pName << nl << endl;
+volScalarField p
+(
+    IOobject
+    (
+        pName,
+        runTime.timeName(),
+        mesh,
+        IOobject::READ_IF_PRESENT,
+        IOobject::NO_WRITE,
+        false
+    ),
+    mesh,
+    dimensionedScalar(sqr(dimVelocity), Zero),
+    pBCTypes
+);
+
+// Infer the velocity potential BCs from the pressure
+wordList PhiBCTypes
+(
+    p.boundaryField().size(),
+    zeroGradientFvPatchScalarField::typeName
+);
+
+forAll(p.boundaryField(), patchi)
+{
+    if (p.boundaryField()[patchi].fixesValue())
+    {
+        PhiBCTypes[patchi] = fixedValueFvPatchScalarField::typeName;
+    }
+}
+
+Info<< "Constructing velocity potential field Phi\n" << endl;
+volScalarField Phi
+(
+    IOobject
+    (
+        "Phi",
+        runTime.timeName(),
+        mesh,
+        IOobject::READ_IF_PRESENT,
+        IOobject::NO_WRITE
+    ),
+    mesh,
+    dimensionedScalar(dimLength*dimVelocity, Zero),
+    PhiBCTypes
+);
+
+label PhiRefCell = 0;
+scalar PhiRefValue = 0;
+setRefCell
+(
+    Phi,
+    potentialFlow.dict(),
+    PhiRefCell,
+    PhiRefValue
+);
+mesh.setFluxRequired(Phi.name());
+
+#include "createMRF.H"
 
 // Add solver-specific interpolations
 {

applications/solvers/basic/potentialFoam/overPotentialFoam/meson.build

@@ -1,36 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'overPotentialFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_meshTools,
-    lib_dynamicFvMesh,
-    lib_sampling,
-    lib_overset,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/basic/potentialFoam/overPotentialFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/overset',
-    '-I' + recursive_include_dirs / 'applications/solvers/basic/potentialFoam/overPotentialFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_overPotentialFoam = executable(
-    'overPotentialFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/basic/potentialFoam/overPotentialFoam/overPotentialFoam.C

@@ -83,7 +83,6 @@ Description
     \heading Options
     \plaintable
         -writep   | write the Euler pressure
-        -writephi | Write the final volumetric flux
         -writePhi | Write the final velocity potential
         -initialiseUBCs | Update the velocity boundaries before solving for Phi
     \endplaintable
@@ -118,12 +117,6 @@ int main(int argc, char *argv[])
         "Initialise U boundary conditions"
     );
 
-    argList::addBoolOption
-    (
-        "writephi",
-        "Write the final volumetric flux field"
-    );
-
     argList::addBoolOption
     (
         "writePhi",
@@ -142,8 +135,6 @@ int main(int argc, char *argv[])
         "Execute functionObjects"
     );
 
-    #include "addRegionOption.H"
-    #include "addCheckCaseOptions.H"
     #include "setRootCaseLists.H"
     #include "createTime.H"
     #include "createNamedDynamicFvMesh.H"
@@ -203,16 +194,11 @@ int main(int argc, char *argv[])
             << endl;
     }
 
-    // Write U
+    // Write U and phi
     U.write();
+    phi.write();
 
-    // Optionally write the volumetric flux, phi
-    if (args.found("writephi"))
-    {
-        phi.write();
-    }
-
-    // Optionally write velocity potential, Phi
+    // Optionally write Phi
     if (args.found("writePhi"))
     {
         Phi.write();

applications/solvers/basic/scalarTransportFoam/meson.build

@@ -1,33 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'scalarTransportFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/basic/scalarTransportFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'applications/solvers/basic/scalarTransportFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_scalarTransportFoam = executable(
-    'scalarTransportFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2020,2023 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -132,11 +132,6 @@ void PDRkEpsilon::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
-    // Push new cell values to
-    // coupled neighbours. Note that we want to avoid the re-updateCoeffs
-    // of the wallFunctions so make sure to bypass the evaluate on
-    // those patches and only do the coupled ones.
-    epsilon_.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
 
     // Add the blockage generation term so that it is included consistently
     // in both the k and epsilon equations

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C

@@ -109,7 +109,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                IOobject::NO_REGISTER
+                false
             ),
             mesh,
             dimensionedScalar(Nv.dimensions(), Zero)

applications/solvers/combustion/PDRFoam/meson.build

@@ -1,79 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'XiModels/XiModel/XiModel.C',
-    'XiModels/XiModel/XiModelNew.C',
-    'XiModels/fixed/fixed.C',
-    'XiModels/algebraic/algebraic.C',
-    'XiModels/transport/transport.C',
-    'XiModels/XiEqModels/XiEqModel/XiEqModel.C',
-    'XiModels/XiEqModels/XiEqModel/XiEqModelNew.C',
-    'XiModels/XiEqModels/Gulder/Gulder.C',
-    'XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C',
-    'XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C',
-    'XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C',
-    'XiModels/XiGModels/XiGModel/XiGModel.C',
-    'XiModels/XiGModels/XiGModel/XiGModelNew.C',
-    'XiModels/XiGModels/KTS/KTS.C',
-    'XiModels/XiGModels/instabilityG/instabilityG.C',
-    'PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C',
-    'PDRModels/dragModels/PDRDragModel/PDRDragModel.C',
-    'PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C',
-    'PDRModels/dragModels/basic/basic.C',
-    'PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C',
-    'PDRModels/XiGModels/basicXiSubG/basicXiSubG.C',
-    'laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C',
-    'PDRFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_engine,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_reactionThermophysicalModels,
-    lib_specie,
-    lib_laminarFlameSpeedModels,
-    lib_dynamicFvMesh,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/combustion/PDRFoam',
-    '-I' + meson.source_root() / 'applications/solvers/combustion/PDRFoam/XiModels/XiModel',
-    '-I' + meson.source_root() / 'applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel',
-    '-I' + meson.source_root() / 'applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel',
-    '-I' + meson.source_root() / 'applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel',
-    '-I' + meson.source_root() / 'applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/surfMesh',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/engine',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/reactionThermo',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/laminarFlameSpeed',
-    '-I' + recursive_include_dirs / 'src/dynamicMesh',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'applications/solvers/combustion/PDRFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_PDRFoam = executable(
-    'PDRFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/combustion/XiFoam/XiDyMFoam/meson.build

@@ -1,57 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'XiDyMFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_dynamicMesh,
-    lib_dynamicFvMesh,
-    lib_topoChangerFvMesh,
-    lib_sampling,
-    lib_engine,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_reactionThermophysicalModels,
-    lib_specie,
-    lib_laminarFlameSpeedModels,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/combustion/XiFoam/XiDyMFoam',
-    '-I' + meson.source_root() / 'applications/solvers/combustion/XiFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/fvOptions',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/dynamicMesh',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/engine',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/reactionThermo',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/laminarFlameSpeed',
-    '-I' + recursive_include_dirs / 'applications/solvers/combustion/XiFoam/XiDyMFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_XiDyMFoam = executable(
-    'XiDyMFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/combustion/XiFoam/XiEngineFoam/meson.build

@@ -1,51 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'XiEngineFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_engine,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_reactionThermophysicalModels,
-    lib_specie,
-    lib_laminarFlameSpeedModels,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/combustion/XiFoam/XiEngineFoam',
-    '-I' + meson.source_root() / 'applications/solvers/combustion/XiFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/engine',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/reactionThermo',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/laminarFlameSpeed',
-    '-I' + recursive_include_dirs / 'applications/solvers/combustion/XiFoam/XiEngineFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_XiEngineFoam = executable(
-    'XiEngineFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/combustion/XiFoam/bEqn.H

@@ -171,7 +171,10 @@ if (ign.ignited())
 
         fvOptions.correct(Su);
 
-        Su.clamp_range(SuMin, SuMax);
+        // Limit the maximum Su
+        // ~~~~~~~~~~~~~~~~~~~~
+        Su.min(SuMax);
+        Su.max(SuMin);
     }
     else
     {
@@ -215,7 +218,7 @@ if (ign.ignited())
           + (
                 scalar(1)
               + (2*XiShapeCoef)
-               *(scalar(0.5) - clamp(b, zero_one{}))
+               *(scalar(0.5) - min(max(b, scalar(0)), scalar(1)))
             )*(XiEqStar - scalar(1.001))
         );
 
@@ -223,7 +226,7 @@ if (ign.ignited())
         volScalarField R(Gstar*XiEqStar/(XiEqStar - scalar(1)));
         volScalarField G(R*(XiEq - scalar(1.001))/XiEq);
 
-        //R *= (Gstar + 2*mag(devSymm(fvc::grad(U))))/Gstar;
+        //R *= (Gstar + 2*mag(dev(symm(fvc::grad(U)))))/Gstar;
 
         // Solve for the flame wrinkling
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

applications/solvers/combustion/XiFoam/meson.build

@@ -1,53 +0,0 @@
-subdir('XiDyMFoam')
-subdir('XiEngineFoam')
-
-srcfiles = [
-    lnInclude_hack,
-    'XiFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_engine,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_reactionThermophysicalModels,
-    lib_specie,
-    lib_laminarFlameSpeedModels,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/combustion/XiFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/engine',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/reactionThermo',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/laminarFlameSpeed',
-    '-I' + recursive_include_dirs / 'applications/solvers/combustion/XiFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_XiFoam = executable(
-    'XiFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/combustion/chemFoam/createBaseFields.H

@@ -12,7 +12,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl;
             mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            IOobject::NO_REGISTER
+            false
         ),
         mesh,
         dimensionedScalar("Ydefault", dimless, 1)
@@ -29,7 +29,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl;
             mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            IOobject::NO_REGISTER
+            false
         ),
         mesh,
         dimensionedScalar("p", dimPressure, p0)
@@ -46,7 +46,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl;
             mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            IOobject::NO_REGISTER
+            false
         ),
         mesh,
         dimensionedScalar("T", dimTemperature, T0)

applications/solvers/combustion/chemFoam/meson.build

@@ -1,41 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'chemFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_meshTools,
-    lib_fluidThermophysicalModels,
-    lib_reactionThermophysicalModels,
-    lib_chemistryModel,
-    lib_thermophysicalProperties,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/combustion/chemFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/ODE',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/reactionThermo',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/chemistryModel',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/thermophysicalProperties',
-    '-I' + recursive_include_dirs / 'applications/solvers/combustion/chemFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_chemFoam = executable(
-    'chemFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/combustion/chemFoam/setDeltaT.H

@@ -1,5 +1,5 @@
 if (adjustTimeStep)
 {
     runTime.setDeltaT(min(dtChem, maxDeltaT));
-    Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
+    Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
 }

applications/solvers/combustion/chemFoam/solveChemistry.H

@@ -1,3 +1,3 @@
-dtChem = chemistry.solve(runTime.deltaTValue());
+dtChem = chemistry.solve(runTime.deltaT().value());
 scalar Qdot = chemistry.Qdot()()[0]/rho[0];
-integratedHeat += Qdot*runTime.deltaTValue();
+integratedHeat += Qdot*runTime.deltaT().value();

applications/solvers/combustion/coldEngineFoam/meson.build

@@ -1,49 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'coldEngineFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_engine,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/combustion/coldEngineFoam',
-    '-I' + meson.source_root() / 'applications/solvers/combustion/XiFoam/XiEngineFoam',
-    '-I' + meson.source_root() / 'applications/solvers/combustion/XiFoam',
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoPimpleFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/engine',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/reactionThermo',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'applications/solvers/combustion/coldEngineFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_coldEngineFoam = executable(
-    'coldEngineFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/combustion/fireFoam/YEEqn.H

@@ -39,13 +39,13 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.correct(Yi);
 
-            Yi.clamp_min(0);
+            Yi.max(0.0);
             Yt += Yi;
         }
     }
 
     Y[inertIndex] = scalar(1) - Yt;
-    Y[inertIndex].clamp_min(0);
+    Y[inertIndex].max(0.0);
 
     radiation->correct();
 

applications/solvers/combustion/fireFoam/meson.build

@@ -1,81 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'fireFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_specie,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_thermophysicalProperties,
-    lib_reactionThermophysicalModels,
-    lib_SLGThermo,
-    lib_chemistryModel,
-    lib_solidChemistryModel,
-    lib_combustionModels,
-    lib_regionModels,
-    lib_radiationModels,
-    lib_surfaceFilmModels,
-    lib_surfaceFilmDerivedFvPatchFields,
-    lib_pyrolysisModels,
-    lib_regionCoupling,
-    lib_lagrangian,
-    lib_lagrangianIntermediate,
-    lib_lagrangianTurbulence,
-    lib_ODE,
-    lib_regionFaModels,
-    lib_finiteArea,
-    lib_faOptions,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/combustion/fireFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/finiteArea',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/lagrangian/distributionModels',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/solidThermo',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/chemistryModel',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/solidChemistryModel',
-    '-I' + recursive_include_dirs / 'src/combustionModels',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/thermophysicalProperties',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/reactionThermo',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/SLGThermo',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/radiation',
-    '-I' + recursive_include_dirs / 'src/regionModels/regionModel',
-    '-I' + recursive_include_dirs / 'src/regionModels/surfaceFilmModels',
-    '-I' + recursive_include_dirs / 'src/regionModels/pyrolysisModels',
-    '-I' + recursive_include_dirs / 'src/lagrangian/basic',
-    '-I' + recursive_include_dirs / 'src/lagrangian/intermediate',
-    '-I' + recursive_include_dirs / 'src/ODE',
-    '-I' + recursive_include_dirs / 'src/regionFaModels',
-    '-I' + recursive_include_dirs / 'src/faOptions',
-    '-I' + recursive_include_dirs / 'applications/solvers/combustion/fireFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_fireFoam = executable(
-    'fireFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/combustion/meson.build

@@ -1,6 +0,0 @@
-subdir('PDRFoam')
-subdir('XiFoam')
-subdir('chemFoam')
-subdir('coldEngineFoam')
-subdir('fireFoam')
-subdir('reactingFoam')

applications/solvers/combustion/reactingFoam/YEqn.H

@@ -38,11 +38,11 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.correct(Yi);
 
-            Yi.clamp_min(0);
+            Yi.max(0.0);
             Yt += Yi;
         }
     }
 
     Y[inertIndex] = scalar(1) - Yt;
-    Y[inertIndex].clamp_min(0);
+    Y[inertIndex].max(0.0);
 }

applications/solvers/combustion/reactingFoam/meson.build

@@ -1,55 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'reactingFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_reactionThermophysicalModels,
-    lib_specie,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_chemistryModel,
-    lib_ODE,
-    lib_combustionModels,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/combustion/reactingFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/reactionThermo',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/chemistryModel',
-    '-I' + recursive_include_dirs / 'src/ODE',
-    '-I' + recursive_include_dirs / 'src/combustionModels',
-    '-I' + recursive_include_dirs / 'applications/solvers/combustion/reactingFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_reactingFoam = executable(
-    'reactingFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)
-
-subdir('rhoReactingBuoyantFoam')
-subdir('rhoReactingFoam')

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/meson.build

@@ -1,53 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'rhoReactingBuoyantFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_reactionThermophysicalModels,
-    lib_specie,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_chemistryModel,
-    lib_ODE,
-    lib_combustionModels,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam',
-    '-I' + meson.source_root() / 'applications/solvers/combustion/reactingFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/reactionThermo',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/chemistryModel',
-    '-I' + recursive_include_dirs / 'src/ODE',
-    '-I' + recursive_include_dirs / 'src/combustionModels',
-    '-I' + recursive_include_dirs / 'applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_rhoReactingBuoyantFoam = executable(
-    'rhoReactingBuoyantFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/combustion/reactingFoam/rhoReactingFoam/meson.build

@@ -1,53 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'rhoReactingFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_reactionThermophysicalModels,
-    lib_specie,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_chemistryModel,
-    lib_ODE,
-    lib_combustionModels,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/combustion/reactingFoam/rhoReactingFoam',
-    '-I' + meson.source_root() / 'applications/solvers/combustion/reactingFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/reactionThermo',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/chemistryModel',
-    '-I' + recursive_include_dirs / 'src/ODE',
-    '-I' + recursive_include_dirs / 'src/combustionModels',
-    '-I' + recursive_include_dirs / 'applications/solvers/combustion/reactingFoam/rhoReactingFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_rhoReactingFoam = executable(
-    'rhoReactingFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/compressible/meson.build

@@ -1,5 +0,0 @@
-subdir('rhoCentralFoam')
-subdir('rhoPimpleAdiabaticFoam')
-subdir('rhoPimpleFoam')
-subdir('rhoSimpleFoam')
-subdir('sonicFoam')

applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C

@@ -103,10 +103,16 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
             << exit(FatalIOError);
     }
 
-    if (!this->readValueEntry(dict))
+    if (dict.found("value"))
     {
-        // Fallback: set to the internal field
-        fvPatchField<scalar>::patchInternalField(*this);
+        fvPatchField<scalar>::operator=
+        (
+            scalarField("value", dict, p.size())
+        );
+    }
+    else
+    {
+        fvPatchField<scalar>::operator=(patchInternalField());
     }
 
     refValue() = *this;
@@ -159,10 +165,14 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const auto& pmu = patch().lookupPatchField<volScalarField>(muName_);
-    const auto& prho = patch().lookupPatchField<volScalarField>(rhoName_);
-    const auto& ppsi = patch().lookupPatchField<volScalarField>(psiName_);
-    const auto& pU = patch().lookupPatchField<volVectorField>(UName_);
+    const fvPatchScalarField& pmu =
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
+    const fvPatchScalarField& prho =
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+    const fvPatchField<scalar>& ppsi =
+        patch().lookupPatchField<volScalarField, scalar>(psiName_);
+    const fvPatchVectorField& pU =
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     // Prandtl number reading consistent with rhoCentralFoam
     const dictionary& thermophysicalProperties =
@@ -197,7 +207,7 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::updateCoeffs()
 // Write
 void Foam::smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchField<scalar>::write(os);
+    fvPatchScalarField::write(os);
 
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
@@ -207,7 +217,7 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
     os.writeEntry("accommodationCoeff", accommodationCoeff_);
     Twall_.writeEntry("Twall", os);
     os.writeEntry("gamma", gamma_);
-    fvPatchField<scalar>::writeValueEntry(os);
+    writeEntry("value", os);
 }
 
 

applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C

@@ -105,15 +105,18 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
             << exit(FatalIOError);
     }
 
-    if (this->readValueEntry(dict))
+    if (dict.found("value"))
     {
-        const auto* hasRefValue = dict.findEntry("refValue", keyType::LITERAL);
-        const auto* hasFrac = dict.findEntry("valueFraction", keyType::LITERAL);
+        fvPatchField<vector>::operator=
+        (
+            vectorField("value", dict, p.size())
+        );
 
-        if (hasRefValue && hasFrac)
+        if (dict.found("refValue") && dict.found("valueFraction"))
         {
-            this->refValue().assign(*hasRefValue, p.size());
-            this->valueFraction().assign(*hasFrac, p.size());
+            this->refValue() = vectorField("refValue", dict, p.size());
+            this->valueFraction() =
+                scalarField("valueFraction", dict, p.size());
         }
         else
         {
@@ -152,9 +155,12 @@ void Foam::maxwellSlipUFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const auto& pmu = patch().lookupPatchField<volScalarField>(muName_);
-    const auto& prho = patch().lookupPatchField<volScalarField>(rhoName_);
-    const auto& ppsi = patch().lookupPatchField<volScalarField>(psiName_);
+    const fvPatchScalarField& pmu =
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
+    const fvPatchScalarField& prho =
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+    const fvPatchField<scalar>& ppsi =
+        patch().lookupPatchField<volScalarField, scalar>(psiName_);
 
     Field<scalar> C1
     (
@@ -181,8 +187,8 @@ void Foam::maxwellSlipUFvPatchVectorField::updateCoeffs()
 
     if (curvature_)
     {
-        const auto& ptauMC =
-            patch().lookupPatchField<volTensorField>(tauMCName_);
+        const fvPatchTensorField& ptauMC =
+            patch().lookupPatchField<volTensorField, tensor>(tauMCName_);
         vectorField n(patch().nf());
 
         refValue() -= C1/prho*transform(I - n*n, (n & ptauMC));
@@ -194,7 +200,7 @@ void Foam::maxwellSlipUFvPatchVectorField::updateCoeffs()
 
 void Foam::maxwellSlipUFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchField<vector>::write(os);
+    fvPatchVectorField::write(os);
     os.writeEntryIfDifferent<word>("T", "T", TName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
     os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
@@ -209,7 +215,7 @@ void Foam::maxwellSlipUFvPatchVectorField::write(Ostream& os) const
     refValue().writeEntry("refValue", os);
     valueFraction().writeEntry("valueFraction", os);
 
-    fvPatchField<vector>::writeValueEntry(os);
+    writeEntry("value", os);
 }
 
 

applications/solvers/compressible/rhoCentralFoam/BCs/meson.build

@@ -1,33 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'U/maxwellSlipUFvPatchVectorField.C',
-    'T/smoluchowskiJumpTFvPatchScalarField.C',
-    'rho/fixedRhoFvPatchScalarField.C',
-]
-link_with = [
-    lib_finiteVolume,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-]
-dependencies = []
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoCentralFoam/BCs',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/rhoCentralFoam/BCs',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-lib_rhoCentralFoam = library(
-    'rhoCentralFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)
-pkg.generate(lib_rhoCentralFoam)

applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C

@@ -104,8 +104,11 @@ void Foam::fixedRhoFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const auto& psip = patch().lookupPatchField<volScalarField>(psiName_);
-    const auto& pp = patch().lookupPatchField<volScalarField>(pName_);
+    const fvPatchField<scalar>& psip =
+        patch().lookupPatchField<volScalarField, scalar>(psiName_);
+
+    const fvPatchField<scalar>& pp =
+        patch().lookupPatchField<volScalarField, scalar>(pName_);
 
     operator==(psip*pp);
 
@@ -115,10 +118,11 @@ void Foam::fixedRhoFvPatchScalarField::updateCoeffs()
 
 void Foam::fixedRhoFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchField<scalar>::write(os);
+    fvPatchScalarField::write(os);
+
     os.writeEntryIfDifferent<word>("p", "p", pName_);
     os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
-    fvPatchField<scalar>::writeValueEntry(os);
+    writeEntry("value", os);
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H

@@ -17,7 +17,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
             vf,
             dir,
             "reconstruct("
-          + (reconFieldName.empty() ? vf.name() : reconFieldName)
+          + (reconFieldName != word::null ? reconFieldName : vf.name())
           + ')'
         )
     );

applications/solvers/compressible/rhoCentralFoam/meson.build

@@ -1,49 +0,0 @@
-subdir('BCs')
-
-srcfiles = [
-    lnInclude_hack,
-    'rhoCentralFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_rhoCentralFoam,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_dynamicFvMesh,
-    lib_topoChangerFvMesh,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoCentralFoam',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/rhoCentralFoam/BCs',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/rhoCentralFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_rhoCentralFoam = executable(
-    'rhoCentralFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/compressible/rhoPimpleAdiabaticFoam/meson.build

@@ -1,44 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'rhoPimpleAdiabaticFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoPimpleAdiabaticFoam',
-    '-I' + meson.source_root() / 'src/finiteVolume/cfdTools',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/rhoPimpleAdiabaticFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_rhoPimpleAdiabaticFoam = executable(
-    'rhoPimpleAdiabaticFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/compressible/rhoPimpleFoam/meson.build

@@ -1,55 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'rhoPimpleFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_dynamicMesh,
-    lib_dynamicFvMesh,
-    lib_topoChangerFvMesh,
-    lib_sampling,
-    lib_atmosphericModels,
-    lib_regionFaModels,
-    lib_finiteArea,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoPimpleFoam',
-    '-I' + meson.source_root() / 'src/finiteVolume/cfdTools',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/dynamicMesh',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/regionFaModels',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/rhoPimpleFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_rhoPimpleFoam = executable(
-    'rhoPimpleFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)
-
-subdir('overRhoPimpleDyMFoam')

applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H

@@ -29,7 +29,7 @@ if (mesh.changing())
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        fvPatchFieldBase::zeroGradientType()
+        zeroGradientFvPatchScalarField::typeName
     );
 
     // Set BCs of pcorr to fixed-value for patches at which p is fixed

applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/meson.build

@@ -1,50 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'overRhoPimpleDyMFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_dynamicFvMesh,
-    lib_topoChangerFvMesh,
-    lib_overset,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam',
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoPimpleFoam',
-    '-I' + meson.source_root() / 'src/finiteVolume/cfdTools',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/dynamicMesh',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/overset',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_overRhoPimpleDyMFoam = executable(
-    'overRhoPimpleDyMFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/compressible/rhoSimpleFoam/meson.build

@@ -1,51 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'rhoSimpleFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_atmosphericModels,
-    lib_regionFaModels,
-    lib_finiteArea,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoSimpleFoam',
-    '-I' + meson.source_root() / 'src/finiteVolume/cfdTools',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/regionFaModels',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/rhoSimpleFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_rhoSimpleFoam = executable(
-    'rhoSimpleFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)
-
-subdir('overRhoSimpleFoam')
-subdir('rhoPorousSimpleFoam')

applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/meson.build

@@ -1,51 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'overRhoSimpleFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_dynamicFvMesh,
-    lib_topoChangerFvMesh,
-    lib_sampling,
-    lib_overset,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam',
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoSimpleFoam',
-    '-I' + meson.source_root() / 'src/finiteVolume/cfdTools',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/dynamicMesh',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/overset',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_overRhoSimpleFoam = executable(
-    'overRhoSimpleFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/meson.build

@@ -1,45 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'rhoPorousSimpleFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam',
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoSimpleFoam',
-    '-I' + meson.source_root() / 'src/finiteVolume/cfdTools',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_rhoPorousSimpleFoam = executable(
-    'rhoPorousSimpleFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/compressible/sonicFoam/meson.build

@@ -1,46 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'sonicFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/compressible/sonicFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/sonicFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_sonicFoam = executable(
-    'sonicFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)
-
-subdir('sonicDyMFoam')
-subdir('sonicLiquidFoam')

applications/solvers/compressible/sonicFoam/sonicDyMFoam/meson.build

@@ -1,51 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'sonicDyMFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_dynamicMesh,
-    lib_dynamicFvMesh,
-    lib_topoChangerFvMesh,
-    lib_sampling,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/compressible/sonicFoam/sonicDyMFoam',
-    '-I' + meson.source_root() / 'applications/solvers/compressible/sonicFoam',
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoPimpleFoam',
-    '-I' + meson.source_root() / 'src/finiteVolume/cfdTools',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/dynamicMesh',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/sonicFoam/sonicDyMFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_sonicDyMFoam = executable(
-    'sonicDyMFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/compressible/sonicFoam/sonicLiquidFoam/meson.build

@@ -1,30 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'sonicLiquidFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_meshTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/compressible/sonicFoam/sonicLiquidFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'applications/solvers/compressible/sonicFoam/sonicLiquidFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_sonicLiquidFoam = executable(
-    'sonicLiquidFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/discreteMethods/dsmc/dsmcFoam/meson.build

@@ -1,34 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'dsmcFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_meshTools,
-    lib_finiteVolume,
-    lib_lagrangian,
-    lib_DSMC,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/discreteMethods/dsmc/dsmcFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/lagrangian/basic',
-    '-I' + recursive_include_dirs / 'src/lagrangian/DSMC',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'applications/solvers/discreteMethods/dsmc/dsmcFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_dsmcFoam = executable(
-    'dsmcFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/discreteMethods/dsmc/meson.build

@@ -1 +0,0 @@
-subdir('dsmcFoam')

applications/solvers/discreteMethods/meson.build

@@ -1,2 +0,0 @@
-subdir('dsmc')
-subdir('molecularDynamics')

applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/meson.build

@@ -1,38 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'mdEquilibrationFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_meshTools,
-    lib_finiteVolume,
-    lib_lagrangian,
-    lib_molecule,
-    lib_potential,
-    lib_molecularMeasurements,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam',
-    '-I' + recursive_include_dirs / 'src/lagrangian/molecularDynamics/molecule',
-    '-I' + recursive_include_dirs / 'src/lagrangian/molecularDynamics/potential',
-    '-I' + recursive_include_dirs / 'src/lagrangian/molecularDynamics/molecularMeasurements',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/lagrangian/basic',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_mdEquilibrationFoam = executable(
-    'mdEquilibrationFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/discreteMethods/molecularDynamics/mdFoam/meson.build

@@ -1,38 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'mdFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_meshTools,
-    lib_finiteVolume,
-    lib_lagrangian,
-    lib_molecule,
-    lib_potential,
-    lib_molecularMeasurements,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/discreteMethods/molecularDynamics/mdFoam',
-    '-I' + recursive_include_dirs / 'src/lagrangian/molecularDynamics/molecule',
-    '-I' + recursive_include_dirs / 'src/lagrangian/molecularDynamics/potential',
-    '-I' + recursive_include_dirs / 'src/lagrangian/molecularDynamics/molecularMeasurements',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/lagrangian/basic',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'applications/solvers/discreteMethods/molecularDynamics/mdFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_mdFoam = executable(
-    'mdFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/discreteMethods/molecularDynamics/meson.build

@@ -1,2 +0,0 @@
-subdir('mdEquilibrationFoam')
-subdir('mdFoam')

applications/solvers/electromagnetics/electrostaticFoam/meson.build

@@ -1,30 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'electrostaticFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_meshTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/electromagnetics/electrostaticFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'applications/solvers/electromagnetics/electrostaticFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_electrostaticFoam = executable(
-    'electrostaticFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/electromagnetics/magneticFoam/meson.build

@@ -1,30 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'magneticFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_meshTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/electromagnetics/magneticFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'applications/solvers/electromagnetics/magneticFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_magneticFoam = executable(
-    'magneticFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/electromagnetics/meson.build

@@ -1,3 +0,0 @@
-subdir('electrostaticFoam')
-subdir('magneticFoam')
-subdir('mhdFoam')

applications/solvers/electromagnetics/mhdFoam/meson.build

@@ -1,30 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'mhdFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_meshTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/electromagnetics/mhdFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'applications/solvers/electromagnetics/mhdFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_mhdFoam = executable(
-    'mhdFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/financial/financialFoam/meson.build

@@ -1,32 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'financialFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_meshTools,
-    lib_sampling,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/financial/financialFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'applications/solvers/financial/financialFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_financialFoam = executable(
-    'financialFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/financial/meson.build

@@ -1 +0,0 @@
-subdir('financialFoam')

applications/solvers/finiteArea/liquidFilmFoam/capillaryCourantNo.H

@@ -7,7 +7,7 @@
             *mag(aMesh.edgeInterpolation::deltaCoeffs())
             /rhol
         )
-    ).value()*runTime.deltaTValue();
+    ).value()*runTime.deltaT().value();
 
     Info<< "Max Capillary Courant Number = " << CoNumSigma << '\n' << endl;
 }

applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C

@@ -87,13 +87,7 @@ int main(int argc, char *argv[])
             (
                 fam::ddt(h, Us)
               + fam::div(phi2s, Us)
-              + fam::Sp
-                (
-                    0.0125
-                   *frictionFactor.internalField()
-                   *mag(Us.internalField()),
-                    Us
-                )
+              + fam::Sp(0.0125*frictionFactor*mag(Us), Us)
              ==
                 Gs*h
               - fam::Sp(Sd, Us)

applications/solvers/finiteArea/liquidFilmFoam/meson.build

@@ -1,32 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'liquidFilmFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteArea,
-    lib_finiteVolume,
-    lib_meshTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/finiteArea/liquidFilmFoam',
-    '-I' + recursive_include_dirs / 'src/finiteArea',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'applications/solvers/finiteArea/liquidFilmFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_liquidFilmFoam = executable(
-    'liquidFilmFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/finiteArea/liquidFilmFoam/surfaceCourantNo.H

@@ -47,10 +47,10 @@ if (aMesh.nInternalEdges())
     );
 
     CoNum = max(SfUfbyDelta/aMesh.magLe())
-        .value()*runTime.deltaTValue();
+        .value()*runTime.deltaT().value();
 
     meanCoNum = (sum(SfUfbyDelta)/sum(aMesh.magLe()))
-        .value()*runTime.deltaTValue();
+        .value()*runTime.deltaT().value();
 
     velMag = max(mag(phis)/aMesh.magLe()).value();
 }

applications/solvers/finiteArea/meson.build

@@ -1,3 +0,0 @@
-subdir('liquidFilmFoam')
-subdir('sphereSurfactantFoam')
-subdir('surfactantFoam')

applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H

@@ -47,7 +47,6 @@ forAll(Us, faceI)
     Us[faceI].z() =
         Uinf.value()*0.25*R[faceI].x()*R[faceI].z()/sqr(mag(R[faceI]));
 }
-Us.boundaryFieldRef().evaluateCoupled<coupledFaPatch>();
 
 Us -= aMesh.faceAreaNormals()*(aMesh.faceAreaNormals() & Us);
 

applications/solvers/finiteArea/sphereSurfactantFoam/meson.build

@@ -1,32 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'sphereSurfactantFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteArea,
-    lib_finiteVolume,
-    lib_meshTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/finiteArea/sphereSurfactantFoam',
-    '-I' + recursive_include_dirs / 'src/finiteArea',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'applications/solvers/finiteArea/sphereSurfactantFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_sphereSurfactantFoam = executable(
-    'sphereSurfactantFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/finiteArea/surfactantFoam/meson.build

@@ -1,32 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'surfactantFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteArea,
-    lib_finiteVolume,
-    lib_meshTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/finiteArea/surfactantFoam',
-    '-I' + recursive_include_dirs / 'src/finiteArea',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'applications/solvers/finiteArea/surfactantFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_surfactantFoam = executable(
-    'surfactantFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/meson.build

@@ -1,49 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'buoyantBoussinesqPimpleFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_dynamicMesh,
-    lib_dynamicFvMesh,
-    lib_sampling,
-    lib_turbulenceModels,
-    lib_incompressibleTurbulenceModels,
-    lib_incompressibleTransportModels,
-    lib_radiationModels,
-    lib_atmosphericModels,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam',
-    '-I' + meson.source_root() / 'applications/solvers/incompressible/pimpleFoam',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/dynamicMesh',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/incompressible',
-    '-I' + meson.source_root() / 'src/transportModels',
-    '-I' + meson.source_root() / 'src/transportModels/incompressible/singlePhaseTransportModel',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/radiation',
-    '-I' + recursive_include_dirs / 'applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_buoyantBoussinesqPimpleFoam = executable(
-    'buoyantBoussinesqPimpleFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/meson.build

@@ -1,43 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'buoyantBoussinesqSimpleFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_turbulenceModels,
-    lib_incompressibleTurbulenceModels,
-    lib_incompressibleTransportModels,
-    lib_radiationModels,
-    lib_atmosphericModels,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/incompressible',
-    '-I' + meson.source_root() / 'src/transportModels',
-    '-I' + meson.source_root() / 'src/transportModels/incompressible/singlePhaseTransportModel',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/radiation',
-    '-I' + recursive_include_dirs / 'applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_buoyantBoussinesqSimpleFoam = executable(
-    'buoyantBoussinesqSimpleFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/heatTransfer/buoyantPimpleFoam/meson.build

@@ -1,57 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'buoyantPimpleFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_radiationModels,
-    lib_specie,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_atmosphericModels,
-    lib_dynamicMesh,
-    lib_dynamicFvMesh,
-    lib_topoChangerFvMesh,
-    lib_regionFaModels,
-    lib_finiteArea,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/buoyantPimpleFoam',
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoPimpleFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/radiation',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/dynamicMesh',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'src/regionFaModels',
-    '-I' + recursive_include_dirs / 'applications/solvers/heatTransfer/buoyantPimpleFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_buoyantPimpleFoam = executable(
-    'buoyantPimpleFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)
-
-subdir('overBuoyantPimpleDyMFoam')

applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H

@@ -29,7 +29,7 @@ if (mesh.changing())
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        fvPatchFieldBase::zeroGradientType()
+        zeroGradientFvPatchScalarField::typeName
     );
 
     // Set BCs of pcorr to fixed-value for patches at which p is fixed

applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/meson.build

@@ -1,54 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'overBuoyantPimpleDyMFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_sampling,
-    lib_meshTools,
-    lib_fvOptions,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_radiationModels,
-    lib_specie,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_atmosphericModels,
-    lib_overset,
-    lib_dynamicFvMesh,
-    lib_topoChangerFvMesh,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/buoyantPimpleFoam',
-    '-I' + meson.source_root() / 'applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'src/dynamicMesh',
-    '-I' + recursive_include_dirs / 'src/overset',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/radiation',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_overBuoyantPimpleDyMFoam = executable(
-    'overBuoyantPimpleDyMFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/heatTransfer/buoyantSimpleFoam/meson.build

@@ -1,49 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'buoyantSimpleFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_radiationModels,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_atmosphericModels,
-    lib_regionFaModels,
-    lib_finiteArea,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/buoyantSimpleFoam',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/radiation',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/regionFaModels',
-    '-I' + recursive_include_dirs / 'applications/solvers/heatTransfer/buoyantSimpleFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_buoyantSimpleFoam = executable(
-    'buoyantSimpleFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H

@@ -108,7 +108,7 @@ forAll(fluidRegions, i)
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE
             ),
-            dimensionedScalar(word::null, dimLength, Zero)
+            dimensionedScalar("hRef", dimLength, Zero) // uses name
         )
     );
 

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/meson.build

@@ -1,63 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'chtMultiRegionSimpleFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_solidThermo,
-    lib_specie,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_radiationModels,
-    lib_fvOptions,
-    lib_faOptions,
-    lib_regionModels,
-    lib_sampling,
-    lib_regionFaModels,
-    lib_finiteArea,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/solid',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/include',
-    '-I' + meson.source_root() / 'src/finiteVolume/cfdTools',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/solidThermo',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/radiation',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/regionModels/regionModel',
-    '-I' + recursive_include_dirs / 'src/regionFaModels',
-    '-I' + recursive_include_dirs / 'applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_chtMultiRegionSimpleFoam = executable(
-    'chtMultiRegionSimpleFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/files

@@ -1,5 +1,5 @@
 derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
-solid/solidRegionDiffNo.C
+../solid/solidRegionDiffNo.C
 chtMultiRegionTwoPhaseEulerFoam.C
 
 EXE = $(FOAM_APPBIN)/chtMultiRegionTwoPhaseEulerFoam

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C

@@ -88,29 +88,26 @@ kappa
 
         case mtLookup:
         {
+            if (mesh.foundObject<volScalarField>(kappaName_))
             {
-                const auto* ptr =
-                    mesh.cfindObject<volScalarField>(kappaName_);
-
-                if (ptr)
-                {
-                    return patch().patchField(*ptr);
-                }
+                return patch().lookupPatchField<volScalarField, scalar>
+                (
+                    kappaName_
+                );
             }
+            else if (mesh.foundObject<volSymmTensorField>(kappaName_))
             {
-                const auto* ptr =
-                    mesh.cfindObject<volSymmTensorField>(kappaName_);
+                const symmTensorField& KWall =
+                    patch().lookupPatchField<volSymmTensorField, scalar>
+                    (
+                        kappaName_
+                    );
 
-                if (ptr)
-                {
-                    const symmTensorField& KWall = patch().patchField(*ptr);
+                const vectorField n(patch().nf());
 
-                    const vectorField n(patch().nf());
-
-                    return n & KWall & n;
-                }
+                return n & KWall & n;
             }
-
+            else
             {
                 FatalErrorInFunction
                     << "Did not find field " << kappaName_
@@ -120,6 +117,9 @@ kappa
                     << " or volSymmTensorField."
                     << exit(FatalError);
             }
+
+
+
             break;
         }
 
@@ -131,8 +131,10 @@ kappa
                 mesh.lookupObject<phaseSystem>("phaseProperties")
             );
 
-            auto tkappaEff = tmp<scalarField>::New(patch().size(), Zero);
-            auto& kappaEff = tkappaEff.ref();
+            tmp<scalarField> kappaEff
+            (
+                new scalarField(patch().size(), 0.0)
+            );
 
             forAll(fluid.phases(), phasei)
             {
@@ -140,10 +142,10 @@ kappa
 
                 const fvPatchScalarField& alpha = phase.boundaryField()[patchi];
 
-                kappaEff += alpha*phase.kappaEff(patchi)();
+                kappaEff.ref() += alpha*phase.kappaEff(patchi)();
             }
 
-            return tkappaEff;
+            return kappaEff;
 
             break;
         }
@@ -159,11 +161,9 @@ kappa
         }
     }
 
-    // Return zero-sized (not nullptr)
-    return tmp<scalarField>::New();
+    return scalarField(0);
 }
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 
@@ -243,12 +243,14 @@ turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
             << exit(FatalError);
     }
 
+    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
 
-    this->readValueEntry(dict, IOobjectOption::MUST_READ);
-
-    if (this->readMixedEntries(dict))
+    if (dict.found("refValue"))
     {
         // Full restart
+        refValue() = scalarField("refValue", dict, p.size());
+        refGrad() = scalarField("refGradient", dict, p.size());
+        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
@@ -292,7 +294,8 @@ updateCoeffs()
 
     // Since we're inside initEvaluate/evaluate there might be processor
     // comms underway. Change the tag we use.
-    const int oldTag = UPstream::incrMsgType();
+    int oldTag = UPstream::msgType();
+    UPstream::msgType() = oldTag+1;
 
     // Get the coupling information from the mappedPatchBase
     const label patchi = patch().index();
@@ -305,11 +308,12 @@ updateCoeffs()
 
     scalarField& Tp = *this;
 
-    const auto& nbrField =
-        refCast
-        <
-            const turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
-        >(nbrPatch.lookupPatchField<volScalarField>(TnbrName_));
+    const turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField&
+        nbrField = refCast
+            <const turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField>
+            (
+                nbrPatch.lookupPatchField<volScalarField, scalar>(TnbrName_)
+            );
 
     // Swap to obtain full local values of neighbour internal field
     scalarField TcNbr(nbrField.patchInternalField());
@@ -326,13 +330,13 @@ updateCoeffs()
     scalarField qr(Tp.size(), 0.0);
     if (qrName_ != "none")
     {
-        qr = patch().lookupPatchField<volScalarField>(qrName_);
+        qr = patch().lookupPatchField<volScalarField, scalar>(qrName_);
     }
 
     scalarField qrNbr(Tp.size(), 0.0);
     if (qrNbrName_ != "none")
     {
-        qrNbr = nbrPatch.lookupPatchField<volScalarField>(qrNbrName_);
+        qrNbr = nbrPatch.lookupPatchField<volScalarField, scalar>(qrNbrName_);
         mpp.distribute(qrNbr);
     }
 
@@ -470,9 +474,10 @@ updateCoeffs()
             << regionTypeNames_ << nl << exit(FatalError);
     }
 
-    UPstream::msgType(oldTag);  // Restore tag
-
     mixedFvPatchScalarField::updateCoeffs();
+
+    // Restore tag
+    UPstream::msgType() = oldTag;
 }
 
 
@@ -481,7 +486,7 @@ void turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchField<scalar>::write(os);
+    mixedFvPatchScalarField::write(os);
     os.writeEntry("kappaMethod", KMethodTypeNames_[method_]);
     os.writeEntryIfDifferent<word>("kappa","none", kappaName_);
 

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/createFluidFields.H

@@ -221,7 +221,7 @@ forAll(fluidRegions, i)
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE
             ),
-            dimensionedScalar(word::null, dimLength, Zero)
+            dimensionedScalar("hRef", dimLength, Zero)
         )
     );
 

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/initContinuityErrs.H

@@ -13,11 +13,11 @@ forAll(cumulativeContErrIO, i)
                 "cumulativeContErr",
                 runTime.timeName(),
                 "uniform",
-                mesh.thisDb(),
+                mesh,
                 IOobject::READ_IF_PRESENT,
                 IOobject::AUTO_WRITE
             ),
-            dimensionedScalar(word::null, dimless, Zero)
+            dimensionedScalar(dimless, Zero)
         )
     );
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/meson.build

@@ -1,63 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C',
-    '../solid/solidRegionDiffNo.C',
-    'chtMultiRegionTwoPhaseEulerFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_solidThermo,
-    lib_radiationModels,
-    lib_regionModels,
-    lib_reactingMultiphaseSystem,
-    lib_reactingTwoPhaseSystem,
-    lib_twoPhaseReactingTurbulenceModels,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam',
-    '-I' + meson.source_root() / 'applications/solvers/multiphase/reactingTwoPhaseEulerFoam',
-    '-I' + recursive_include_dirs / 'src/phaseSystemModels/reactingEuler/twoPhaseSystem',
-    '-I' + recursive_include_dirs / 'src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels',
-    '-I' + recursive_include_dirs / 'src/phaseSystemModels/reactingEuler/multiphaseSystem',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/solid',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/fluid',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/include',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/solidThermo',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/radiation',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/phaseCompressible',
-    '-I' + recursive_include_dirs / 'src/regionModels/regionModel',
-    '-I' + recursive_include_dirs / 'applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_chtMultiRegionTwoPhaseEulerFoam = executable(
-    'chtMultiRegionTwoPhaseEulerFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid/solidRegionDiffNo.C

@@ -1 +0,0 @@
-../../solid/solidRegionDiffNo.C

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H

@@ -48,7 +48,7 @@ if (Y.size())
 
             fvOptions.correct(Yi);
 
-            Yi.clamp_min(0);
+            Yi.max(0.0);
             Yt += Yi;
         }
     }
@@ -56,6 +56,6 @@ if (Y.size())
     if (Y.size())
     {
         Y[inertIndex] = scalar(1) - Yt;
-        Y[inertIndex].clamp_min(0);
+        Y[inertIndex].max(0.0);
     }
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H

@@ -112,7 +112,7 @@ forAll(fluidRegions, i)
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE
             ),
-            dimensionedScalar(word::null, dimLength, Zero)
+            dimensionedScalar("hRef", dimLength, Zero) // uses name
         )
     );
 

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H

@@ -13,11 +13,11 @@ forAll(cumulativeContErrIO, i)
                 "cumulativeContErr",
                 runTime.timeName(),
                 "uniform",
-                mesh.thisDb(),
+                mesh,
                 IOobject::READ_IF_PRESENT,
                 IOobject::AUTO_WRITE
             ),
-            dimensionedScalar(word::null, dimless, Zero)
+            dimensionedScalar(dimless, Zero)
         )
     );
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H

@@ -49,11 +49,11 @@ if (adjustTimeStep)
         (
             min
             (
-                min(maxCo/CoNum, maxDi/DiNum)*runTime.deltaTValue(),
+                min(maxCo/CoNum, maxDi/DiNum)*runTime.deltaT().value(),
                 min(runTime.deltaTValue(), maxDeltaT)
             )
         );
-        Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
+        Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
     }
 }
 

applications/solvers/heatTransfer/chtMultiRegionFoam/include/setMultiRegionDeltaT.H

@@ -59,12 +59,12 @@ if (adjustTimeStep)
     (
         min
         (
-            min(deltaTFluid, maxDeltaTSolid)*runTime.deltaTValue(),
+            min(deltaTFluid, maxDeltaTSolid)*runTime.deltaT().value(),
             maxDeltaT
         )
     );
 
-    Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
+    Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
 }
 
 // ************************************************************************* //

applications/solvers/heatTransfer/chtMultiRegionFoam/meson.build

@@ -1,69 +0,0 @@
-subdir('chtMultiRegionSimpleFoam')
-subdir('chtMultiRegionTwoPhaseEulerFoam')
-
-srcfiles = [
-    lnInclude_hack,
-    'fluid/compressibleCourantNo.C',
-    'solid/solidRegionDiffNo.C',
-    'chtMultiRegionFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_specie,
-    lib_reactionThermophysicalModels,
-    lib_solidThermo,
-    lib_chemistryModel,
-    lib_ODE,
-    lib_combustionModels,
-    lib_turbulenceModels,
-    lib_compressibleTurbulenceModels,
-    lib_thermoTools,
-    lib_radiationModels,
-    lib_regionModels,
-    lib_regionFaModels,
-    lib_finiteArea,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/fluid',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/solid',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/include',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/specie',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/reactionThermo',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/solidThermo',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/chemistryModel',
-    '-I' + recursive_include_dirs / 'src/ODE',
-    '-I' + recursive_include_dirs / 'src/combustionModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/turbulenceModels',
-    '-I' + recursive_include_dirs / 'src/TurbulenceModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/radiation',
-    '-I' + recursive_include_dirs / 'src/regionModels/regionModel',
-    '-I' + recursive_include_dirs / 'src/regionFaModels',
-    '-I' + recursive_include_dirs / 'applications/solvers/heatTransfer/chtMultiRegionFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_chtMultiRegionFoam = executable(
-    'chtMultiRegionFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H

@@ -57,7 +57,7 @@
                     ),
                     solidRegions[i],
                     dimensionedSymmTensor(tkappaByCp().dimensions(), Zero),
-                    fvPatchFieldBase::zeroGradientType()
+                    zeroGradientFvPatchSymmTensorField::typeName
                 )
             );
 

applications/solvers/heatTransfer/meson.build

@@ -1,7 +0,0 @@
-subdir('buoyantBoussinesqPimpleFoam')
-subdir('buoyantBoussinesqSimpleFoam')
-subdir('buoyantPimpleFoam')
-subdir('buoyantSimpleFoam')
-subdir('chtMultiRegionFoam')
-subdir('solidFoam')
-subdir('thermoFoam')

applications/solvers/heatTransfer/solidFoam/createFields.H

@@ -34,7 +34,7 @@ if (!thermo.isotropic())
             ),
             mesh,
             dimensionedSymmTensor(tkappaByCp().dimensions(), Zero),
-            fvPatchFieldBase::zeroGradientType()
+            zeroGradientFvPatchSymmTensorField::typeName
         )
     );
     volSymmTensorField& aniAlpha = *taniAlpha;

applications/solvers/heatTransfer/solidFoam/meson.build

@@ -1,51 +0,0 @@
-srcfiles = [
-    lnInclude_hack,
-    'solidRegionDiffNo.C',
-    'solidFoam.C',
-]
-link_with = [
-    lib_OpenFOAM,
-    lib_finiteVolume,
-    lib_fvOptions,
-    lib_meshTools,
-    lib_sampling,
-    lib_dynamicMesh,
-    lib_dynamicFvMesh,
-    lib_topoChangerFvMesh,
-    lib_compressibleTransportModels,
-    lib_fluidThermophysicalModels,
-    lib_solidThermo,
-    lib_radiationModels,
-    lib_specie,
-    lib_thermoTools,
-]
-dependencies = [
-    m_dep,
-    dl_dep,
-]
-cpp_args = [
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/solidFoam',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/include',
-    '-I' + meson.source_root() / 'applications/solvers/heatTransfer/chtMultiRegionFoam/solid',
-    '-I' + recursive_include_dirs / 'src/finiteVolume',
-    '-I' + recursive_include_dirs / 'src/meshTools',
-    '-I' + recursive_include_dirs / 'src/dynamicMesh',
-    '-I' + recursive_include_dirs / 'src/dynamicFvMesh',
-    '-I' + recursive_include_dirs / 'src/sampling',
-    '-I' + recursive_include_dirs / 'src/transportModels/compressible',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/basic',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/solidThermo',
-    '-I' + recursive_include_dirs / 'src/thermophysicalModels/radiation',
-    '-I' + recursive_include_dirs / 'applications/solvers/heatTransfer/solidFoam',
-    '-I' + recursive_include_dirs / 'src/OpenFOAM',
-    '-I' + recursive_include_dirs / 'src/OSspecific/POSIX',
-]
-exe_solidFoam = executable(
-    'solidFoam',
-    srcfiles,
-    link_with: link_with,
-    dependencies: dependencies,
-    cpp_args: cpp_args,
-    implicit_include_directories: false,
-    install: true,
-)

applications/solvers/heatTransfer/thermoFoam/createFields.H

@@ -44,7 +44,7 @@ IOobject turbulencePropertiesHeader
     mesh,
     IOobject::MUST_READ_IF_MODIFIED,
     IOobject::NO_WRITE,
-    IOobject::NO_REGISTER
+    false
 );
 
 if (turbulencePropertiesHeader.typeHeaderOk<IOdictionary>(false))