(WIP) CONFIG: add meson build files

.gitmodules

@@ -17,6 +17,3 @@
 [submodule "external-solver"]
 	path = modules/external-solver
 	url = https://develop.openfoam.com/Modules/external-solver.git
-[submodule "turbulence-community"]
-	path = modules/turbulence-community
-	url = https://gitlab.com/openfoam/community/tc-turbulence/turbulence-community.git

CONTRIBUTORS.md

@@ -33,7 +33,6 @@ It is likely incomplete...
 - Alexander Kabat vel Job
 - Thilo Knacke
 - Shannon Leakey
-- Sergey Lesnik
 - Tommaso Lucchini
 - Graham Macpherson
 - Alexey Matveichev
@@ -60,7 +59,6 @@ It is likely incomplete...
 - Vuko Vukcevic
 - Yi Wang
 - Norbert Weber
-- Gregor Weiss
 - Volker Weissmann
 - Henry Weller
 - Niklas Wikstrom

META-INFO/api-info

@@ -1,2 +1,2 @@
-api=2309
+api=2306
 patch=0

applications/meson.build

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

applications/solvers/DNS/dnsFoam/createFields.H

@@ -30,6 +30,6 @@ volVectorField U
 
 #include "createPhi.H"
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 #include "readTurbulenceProperties.H"

applications/solvers/DNS/dnsFoam/dnsFoam.C

@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
                 fvm::laplacian(rAUf, p) == fvc::div(phiHbyA)
             );
 
-            pEqn.solve(p.select(piso.finalInnerIter()));
+            pEqn.solve(mesh.solver(p.select(piso.finalInnerIter())));
 
             phi = phiHbyA - pEqn.flux();
 

applications/solvers/DNS/dnsFoam/meson.build

@@ -0,0 +1,32 @@
+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

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

applications/solvers/acoustic/acousticFoam/meson.build

@@ -0,0 +1,37 @@
+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/meson.build

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

applications/solvers/basic/laplacianFoam/meson.build

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,35 @@
+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

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

applications/solvers/basic/potentialFoam/createControls.H

@@ -1,6 +1,6 @@
 const dictionary& potentialFlow
 (
-    mesh.solution().solutionDict("potentialFlow")
+    mesh.solutionDict().subDict("potentialFlow")
 );
 
 const int nNonOrthCorr

applications/solvers/basic/potentialFoam/createFields.H

@@ -113,6 +113,6 @@ setRefCell
     PhiRefCell,
     PhiRefValue
 );
-mesh.schemes().setFluxRequired(Phi.name());
+mesh.setFluxRequired(Phi.name());
 
 #include "createMRF.H"

applications/solvers/basic/potentialFoam/meson.build

@@ -0,0 +1,34 @@
+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/createControls.H

@@ -1,6 +1,6 @@
 const dictionary& potentialFlow
 (
-    mesh.solution().solutionDict("potentialFlow")
+    mesh.solutionDict().subDict("potentialFlow")
 );
 
 const int nNonOrthCorr

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

@@ -0,0 +1,36 @@
+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/scalarTransportFoam/meson.build

@@ -0,0 +1,33 @@
+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/bEqn.H

@@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
         mesh,
         fields,
         phi,
-        mesh.schemes().div("div(phi,ft_b_ha_hau)")
+        mesh.divScheme("div(phi,ft_b_ha_hau)")
     )
 );
 

applications/solvers/combustion/PDRFoam/createFields.H

@@ -43,7 +43,7 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::RASModel> turbulence

applications/solvers/combustion/PDRFoam/meson.build

@@ -0,0 +1,79 @@
+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/PDRFoam/pEqn.H

@@ -27,7 +27,7 @@ if (pimple.transonic())
             betav*fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -57,7 +57,7 @@ else
             betav*fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

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

@@ -0,0 +1,57 @@
+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/XiDyMFoam/pEqn.H

@@ -30,7 +30,7 @@ if (pimple.transonic())
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -66,7 +66,7 @@ else
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

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

@@ -0,0 +1,51 @@
+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/XiEngineFoam/pEqn.H

@@ -35,7 +35,7 @@ if (pimple.transonic())
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -71,7 +71,7 @@ else
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/combustion/XiFoam/createFields.H

@@ -44,7 +44,7 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence

applications/solvers/combustion/XiFoam/ftEqn.H

@@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
         mesh,
         fields,
         phi,
-        mesh.schemes().div("div(phi,ft_b_ha_hau)")
+        mesh.divScheme("div(phi,ft_b_ha_hau)")
     )
 );
 

applications/solvers/combustion/XiFoam/meson.build

@@ -0,0 +1,53 @@
+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/XiFoam/pEqn.H

@@ -29,7 +29,7 @@ if (pimple.transonic())
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -64,7 +64,7 @@ else
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/combustion/chemFoam/YEqn.H

@@ -6,7 +6,7 @@
         solve
         (
             fvm::ddt(rho, Yi) - chemistry.RR(specieI),
-            "Yi"
+            mesh.solver("Yi")
         );
     }
 }

applications/solvers/combustion/chemFoam/meson.build

@@ -0,0 +1,41 @@
+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/coldEngineFoam/meson.build

@@ -0,0 +1,49 @@
+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

@@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
         mesh,
         fields,
         phi,
-        mesh.schemes().div("div(phi,Yi_h)")
+        mesh.divScheme("div(phi,Yi_h)")
     )
 );
 {
@@ -35,7 +35,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.constrain(YiEqn);
 
-            YiEqn.solve("Yi");
+            YiEqn.solve(mesh.solver("Yi"));
 
             fvOptions.correct(Yi);
 

applications/solvers/combustion/fireFoam/createFields.H

@@ -89,7 +89,7 @@ volScalarField p_rgh
     mesh
 );
 
-mesh.schemes().setFluxRequired(p_rgh.name());
+mesh.setFluxRequired(p_rgh.name());
 
 #include "phrghEqn.H"
 

applications/solvers/combustion/fireFoam/meson.build

@@ -0,0 +1,81 @@
+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/fireFoam/pEqn.H

@@ -36,7 +36,7 @@ while (pimple.correctNonOrthogonal())
       + fvOptions(psi, p_rgh, rho.name())
     );
 
-    p_rghEqn.solve(p_rgh.select(pimple.finalInnerIter()));
+    p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
     if (pimple.finalNonOrthogonalIter())
     {

applications/solvers/combustion/meson.build

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

applications/solvers/combustion/reactingFoam/YEqn.H

@@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
         mesh,
         fields,
         phi,
-        mesh.schemes().div("div(phi,Yi_h)")
+        mesh.divScheme("div(phi,Yi_h)")
     )
 );
 
@@ -34,7 +34,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.constrain(YiEqn);
 
-            YiEqn.solve("Yi");
+            YiEqn.solve(mesh.solver("Yi"));
 
             fvOptions.correct(Yi);
 

applications/solvers/combustion/reactingFoam/createFields.H

@@ -47,7 +47,7 @@ volScalarField& p = thermo.p();
 
 pressureControl pressureControl(p, rho, pimple.dict(), false);
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 Info << "Creating turbulence model.\n" << nl;
 autoPtr<compressible::turbulenceModel> turbulence

applications/solvers/combustion/reactingFoam/meson.build

@@ -0,0 +1,55 @@
+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/pEqn.H

@@ -37,7 +37,7 @@ if (pimple.transonic())
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -72,7 +72,7 @@ else
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/combustion/reactingFoam/pcEqn.H

@@ -49,7 +49,7 @@ if (pimple.transonic())
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -89,7 +89,7 @@ else
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H

@@ -48,7 +48,7 @@ volScalarField& p = thermo.p();
 
 #include "compressibleCreatePhi.H"
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 Info << "Creating turbulence model.\n" << nl;
 autoPtr<compressible::turbulenceModel> turbulence

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

@@ -0,0 +1,53 @@
+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/rhoReactingBuoyantFoam/pEqn.H

@@ -41,7 +41,7 @@ while (pimple.correctNonOrthogonal())
       - fvm::laplacian(rhorAUf, p_rgh)
     );
 
-    p_rghEqn.solve(p_rgh.select(pimple.finalInnerIter()));
+    p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
     if (pimple.finalNonOrthogonalIter())
     {

applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H

@@ -49,7 +49,7 @@ volScalarField& p = thermo.p();
 
 pressureControl pressureControl(p, rho, pimple.dict(), false);
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 
 Info << "Creating turbulence model.\n" << nl;

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

@@ -0,0 +1,53 @@
+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

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

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

@@ -0,0 +1,33 @@
+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/meson.build

@@ -0,0 +1,49 @@
+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/rhoCentralFoam/readFluxScheme.H

@@ -1,5 +1,5 @@
 word fluxScheme("Kurganov");
-if (mesh.schemes().dict().readIfPresent("fluxScheme", fluxScheme))
+if (mesh.schemesDict().readIfPresent("fluxScheme", fluxScheme))
 {
     if ((fluxScheme == "Tadmor") || (fluxScheme == "Kurganov"))
     {

applications/solvers/compressible/rhoPimpleAdiabaticFoam/createFields.H

@@ -79,7 +79,7 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 #include "createMRF.H"
 

applications/solvers/compressible/rhoPimpleAdiabaticFoam/meson.build

@@ -0,0 +1,44 @@
+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/rhoPimpleAdiabaticFoam/pEqn.H

@@ -63,7 +63,7 @@
                 fvOptions(psi, p, rho.name())
             );
 
-            pEqn.solve(p.select(pimple.finalInnerIter()));
+            pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
             // Rhie & Chow interpolation (part 2)
             if (pimple.finalNonOrthogonalIter())

applications/solvers/compressible/rhoPimpleFoam/createFields.H

@@ -42,7 +42,7 @@ volVectorField U
 
 pressureControl pressureControl(p, rho, pimple.dict(), false);
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence

applications/solvers/compressible/rhoPimpleFoam/meson.build

@@ -0,0 +1,55 @@
+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

@@ -56,7 +56,7 @@ if (mesh.changing())
         pcorrTypes
     );
 
-    mesh.schemes().setFluxRequired(pcorr.name());
+    mesh.setFluxRequired(pcorr.name());
 
 {
     dimensionedScalar rAUf("rAUf", dimTime, 1.0);
@@ -72,7 +72,7 @@ if (mesh.changing())
             divrhoU()
         );
 
-        pcorrEqn.solve(pcorr.select(pimple.finalInnerIter()));
+        pcorrEqn.solve(mesh.solver(pcorr.select(pimple.finalInnerIter())));
         //Bypass virtual layer
         //mesh.fvMesh::solve(pcorrEqn, d);
 

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

@@ -44,7 +44,7 @@ pressureControl pressureControl(p, rho, pimple.dict(), false);
 const dimensionedScalar rhoMax("rhoMax", dimDensity, GREAT, pimple.dict());
 const dimensionedScalar rhoMin("rhoMin", dimDensity, Zero, pimple.dict());
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 #include "createDpdt.H"
 

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

@@ -0,0 +1,50 @@
+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/rhoPimpleFoam/overRhoPimpleDyMFoam/pEqn.H

@@ -56,7 +56,7 @@ if (pimple.transonic())
         // Relax the pressure equation to ensure diagonal-dominance
         pEqn.relax();
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -78,7 +78,7 @@ else
     {
         fvScalarMatrix pEqn(pDDtEqn - fvm::laplacian(rhorAUf, p));
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/compressible/rhoPimpleFoam/pEqn.H

@@ -54,7 +54,7 @@ if (pimple.transonic())
         // Relax the pressure equation to ensure diagonal-dominance
         pEqn.relax();
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -76,7 +76,7 @@ else
     {
         fvScalarMatrix pEqn(pDDtEqn - fvm::laplacian(rhorAUf, p));
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/compressible/rhoPimpleFoam/pcEqn.H

@@ -65,7 +65,7 @@ if (pimple.transonic())
         // Relax the pressure equation to ensure diagonal-dominance
         pEqn.relax();
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -90,7 +90,7 @@ else
     {
         fvScalarMatrix pEqn(pDDtEqn - fvm::laplacian(rhorAtU, p));
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/compressible/rhoSimpleFoam/createFields.H

@@ -40,7 +40,7 @@ volVectorField U
 
 pressureControl pressureControl(p, rho, simple.dict());
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence

applications/solvers/compressible/rhoSimpleFoam/meson.build

@@ -0,0 +1,51 @@
+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/createFields.H

@@ -40,7 +40,7 @@ volVectorField U
 
 pressureControl pressureControl(p, rho, simple.dict());
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence

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

@@ -0,0 +1,51 @@
+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

@@ -0,0 +1,45 @@
+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/createFields.H

@@ -36,7 +36,7 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence

applications/solvers/compressible/sonicFoam/meson.build

@@ -0,0 +1,46 @@
+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

@@ -0,0 +1,51 @@
+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/createFields.H

@@ -46,4 +46,4 @@ volScalarField rho
 
 #include "compressibleCreatePhi.H"
 
-mesh.schemes().setFluxRequired(p.name());
+mesh.setFluxRequired(p.name());

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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,34 @@
+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

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

applications/solvers/discreteMethods/meson.build

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

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

@@ -0,0 +1,38 @@
+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

@@ -0,0 +1,38 @@
+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

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

applications/solvers/electromagnetics/electrostaticFoam/meson.build

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,30 @@
+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

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

applications/solvers/electromagnetics/mhdFoam/createFields.H

@@ -114,5 +114,5 @@ label pRefCell = 0;
 scalar pRefValue = 0.0;
 setRefCell(p, piso.dict(), pRefCell, pRefValue);
 
-mesh.schemes().setFluxRequired(p.name());
-mesh.schemes().setFluxRequired(pB.name());
+mesh.setFluxRequired(p.name());
+mesh.setFluxRequired(pB.name());

applications/solvers/electromagnetics/mhdFoam/meson.build

@@ -0,0 +1,30 @@
+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/electromagnetics/mhdFoam/mhdFoam.C

@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
                     );
 
                     pEqn.setReference(pRefCell, pRefValue);
-                    pEqn.solve(p.select(piso.finalInnerIter()));
+                    pEqn.solve(mesh.solver(p.select(piso.finalInnerIter())));
 
                     if (piso.finalNonOrthogonalIter())
                     {
@@ -167,7 +167,7 @@ int main(int argc, char *argv[])
                     fvm::laplacian(rABf, pB) == fvc::div(phiB)
                 );
 
-                pBEqn.solve(pB.select(bpiso.finalInnerIter()));
+                pBEqn.solve(mesh.solver(pB.select(bpiso.finalInnerIter())));
 
                 if (bpiso.finalNonOrthogonalIter())
                 {

applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H

@@ -1,3 +1,3 @@
-    const dictionary& Bpiso = mesh.solution().solutionDict("BPISO");
+    const dictionary& Bpiso = mesh.solutionDict().subDict("BPISO");
 
     const int nBcorr = Bpiso.getOrDefault<int>("nCorrectors", 1);

applications/solvers/financial/financialFoam/meson.build

@@ -0,0 +1,32 @@
+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

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

applications/solvers/finiteArea/liquidFilmFoam/createFaFields.H

@@ -5,7 +5,7 @@
         (
             "h",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
@@ -20,7 +20,7 @@
         (
             "Us",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
@@ -34,7 +34,7 @@
         (
             "phis",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::AUTO_WRITE
         ),
@@ -48,7 +48,7 @@
         (
             "phi2s",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::AUTO_WRITE
         ),
@@ -67,7 +67,7 @@
         (
             "Sm",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -82,7 +82,7 @@
         (
             "Sd",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -96,7 +96,7 @@
         (
             "Sg",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -112,7 +112,7 @@
         (
             "ps",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
@@ -134,7 +134,7 @@
         (
             "manningField",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
@@ -147,7 +147,7 @@
         (
             "frictionFactor",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -155,4 +155,4 @@
         dimensionedScalar("one", dimless, 0.01)
     );
 
-    aMesh.schemes().setFluxRequired("h");
+    aMesh.setFluxRequired("h");

applications/solvers/finiteArea/liquidFilmFoam/createFvFields.H

@@ -7,7 +7,7 @@ volVectorField U
     (
         "U",
         runTime.timeName(),
-        mesh.thisDb(),
+        mesh,
         IOobject::NO_READ,
         IOobject::AUTO_WRITE
     ),
@@ -22,7 +22,7 @@ volScalarField H
     (
         "H",
         runTime.timeName(),
-        mesh.thisDb(),
+        mesh,
         IOobject::NO_READ,
         IOobject::AUTO_WRITE
     ),

applications/solvers/finiteArea/liquidFilmFoam/meson.build

@@ -0,0 +1,32 @@
+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/readSolutionControls.H

@@ -1 +1 @@
-loopControl iters(runTime, aMesh.solution().solutionDict(), "solution");
+loopControl iters(runTime, aMesh.solutionDict(), "solution");

applications/solvers/finiteArea/meson.build

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

applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H

@@ -5,7 +5,7 @@ areaScalarField Cs
     (
         "Cs",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::MUST_READ,
         IOobject::AUTO_WRITE
     ),
@@ -26,7 +26,7 @@ areaVectorField Us
     (
         "Us",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE
     ),
@@ -58,7 +58,7 @@ edgeScalarField phis
     (
         "phis",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE
     ),

applications/solvers/finiteArea/sphereSurfactantFoam/createFaMesh.H

@@ -0,0 +1,2 @@
+    // Create Finite Area mesh
+    faMesh aMesh(mesh);

applications/solvers/finiteArea/sphereSurfactantFoam/createVolFields.H

@@ -7,7 +7,7 @@
         (
             "Cvf",
             runTime.timeName(),
-            mesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
@@ -24,7 +24,7 @@
         (
             "U",
             runTime.timeName(),
-            mesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),

applications/solvers/finiteArea/sphereSurfactantFoam/meson.build

@@ -0,0 +1,32 @@
+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/createFaFields.H

@@ -5,7 +5,7 @@ areaScalarField Cs
     (
         "Cs",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::MUST_READ,
         IOobject::AUTO_WRITE
     ),
@@ -37,7 +37,7 @@ areaVectorField Us
     (
         "Us",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::MUST_READ,
         IOobject::NO_WRITE
     ),
@@ -51,7 +51,7 @@ edgeScalarField phis
     (
         "phis",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE
     ),

applications/solvers/finiteArea/surfactantFoam/createFaMesh.H

@@ -0,0 +1,2 @@
+    // Create Finite Area mesh
+    faMesh aMesh(mesh);