COMP: g++11: suppress optimisation. See #3024

- freeCommmunicatorComponents needs an additional bounds check.
  When MPI is initialized outside of OpenFOAM, there are no
  UPstream communicator equivalents

.gitlab/issue_templates/bug.md

@@ -49,7 +49,7 @@
 
 <!--
   Providing details of your set-up can help us identify any issues, e.g.
-  OpenFOAM version : v2206|v2112|v2106|v2012|v2006 etc
+  OpenFOAM version : v2112|v2106|v2012|v2006|v1912|v1906 etc
   Operating system : ubuntu|openSUSE|centos etc
   Hardware info    : any info that may help?
   Compiler         : gcc|intel|clang etc

Allwmake

@@ -37,7 +37,7 @@ echo
 echo ========================================
 date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
 echo "Starting compile ${WM_PROJECT_DIR##*/} ${0##*/}"
-echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler [${WM_COMPILE_CONTROL}]"
+echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler"
 echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo ========================================
 echo

CONTRIBUTORS.md

@@ -5,8 +5,6 @@ It is likely incomplete...
 
 ## Contributors (alphabetical by surname)
 
-- Tetsuo Aoyagi
-- Akira Azami
 - William Bainbridge
 - Gabriel Barajas
 - Kutalmis Bercin
@@ -21,7 +19,6 @@ It is likely incomplete...
 - Bernhard Gschaider
 - Andrew Heather
 - David Hill
-- Yoshiaki Inoue
 - Mattijs Janssens
 - Andrew Jackson
 - Hrvoje Jasak

META-INFO/api-info

@@ -1,2 +1,2 @@
-api=2206
-patch=220907
+api=2112
+patch=220610

README.md

@@ -40,9 +40,9 @@ Violations of the Trademark are monitored, and will be duly prosecuted.
 
 If OpenFOAM has already been compiled on your system, simply source
 the appropriate `etc/bashrc` or `etc/cshrc` file and get started.
-For example, for the OpenFOAM-v2206 version:
+For example, for the OpenFOAM-v2112 version:
 ```
-source /installation/path/OpenFOAM-v2206/etc/bashrc
+source /installation/path/OpenFOAM-v2112/etc/bashrc
 ```
 
 ## Compiling OpenFOAM
@@ -127,8 +127,8 @@ These 3rd-party sources are normally located in a directory parallel
 to the OpenFOAM directory. For example,
 ```
 /path/parent
-|-- OpenFOAM-v2206
-\-- ThirdParty-v2206
+|-- OpenFOAM-v2112
+\-- ThirdParty-v2112
 ```
 There are, however, many cases where this simple convention is inadequate:
 
@@ -136,7 +136,7 @@ There are, however, many cases where this simple convention is inadequate:
   operating system or cluster installation provides it)
 
 * When we have changed the OpenFOAM directory name to some arbitrary
-  directory name, e.g. openfoam-sandbox2206, etc..
+  directory name, e.g. openfoam-sandbox2112, etc..
 
 * When we would like any additional 3rd party software to be located
   inside of the OpenFOAM directory to ensure that the installation is
@@ -156,9 +156,9 @@ when locating the ThirdParty directory with the following precedence:
 2. PREFIX/ThirdParty-VERSION
    * this corresponds to the traditional approach
 3. PREFIX/ThirdParty-vAPI
-   * allows for an updated value of VERSION, *eg*, `v2206-myCustom`,
+   * allows for an updated value of VERSION, *eg*, `v2112-myCustom`,
      without requiring a renamed ThirdParty. The API value would still
-     be `2206` and the original `ThirdParty-v2206/` would be found.
+     be `2112` and the original `ThirdParty-v2112/` would be found.
 4. PREFIX/ThirdParty-API
    * same as the previous example, but using an unadorned API value.
 5. PREFIX/ThirdParty-common
@@ -213,4 +213,4 @@ ThirdParty directory will contain either an `Allwmake` file or a
 - [Governance](http://www.openfoam.com/governance/), [Governance Projects](https://www.openfoam.com/governance/projects)
 - [Contacting OpenCFD](http://www.openfoam.com/contact/)
 
-Copyright 2016-2022 OpenCFD Ltd
+Copyright 2016-2021 OpenCFD Ltd

applications/Allwmake

@@ -21,10 +21,10 @@ echo ========================================
 
 #------------------------------------------------------------------------------
 
-wmake -all $targetType utilities
 wmake -all $targetType solvers
+wmake -all $targetType utilities
 
-# Extra tools (optional)
+# Optional
 ## wmake -all $targetType tools
 
 #------------------------------------------------------------------------------

applications/solvers/acoustic/acousticFoam/Make/options

@@ -11,5 +11,4 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels

applications/solvers/combustion/PDRFoam/Make/options

@@ -25,7 +25,6 @@ EXE_LIBS = \
     -lengine \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \

applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C

@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
             "normalisedGradP",
             tmagGradP()/max(tmagGradP())
         );
-        normalisedGradP.writeOpt(IOobject::AUTO_WRITE);
+        normalisedGradP.writeOpt() = IOobject::AUTO_WRITE;
         tmagGradP.clear();
 
         ++runTime;

applications/solvers/combustion/XiFoam/Make/options

@@ -19,7 +19,6 @@ EXE_LIBS = \
     -lengine \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \

applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options

@@ -26,7 +26,6 @@ EXE_LIBS = \
     -lengine \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \

applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options

@@ -20,7 +20,6 @@ EXE_LIBS = \
     -lengine \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \

applications/solvers/combustion/coldEngineFoam/Make/options

@@ -20,7 +20,6 @@ EXE_LIBS = \
     -lengine \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie

applications/solvers/combustion/fireFoam/Make/options

@@ -1,8 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@@ -34,7 +34,6 @@ EXE_LIBS = \
     -lsampling \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \

applications/solvers/combustion/fireFoam/createFieldRefs.H

@@ -1,4 +1,4 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
 regionModels::surfaceFilmModel& surfaceFilm = tsurfaceFilm();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/combustion/reactingFoam/Make/options

@@ -19,7 +19,6 @@ EXE_LIBS = \
     -lsampling \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lreactionThermophysicalModels \
     -lspecie \
     -lcompressibleTransportModels \

applications/solvers/combustion/reactingFoam/createFieldRefs.H

@@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options

@@ -20,7 +20,6 @@ EXE_LIBS = \
     -lsampling \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lreactionThermophysicalModels \
     -lspecie \
     -lcompressibleTransportModels \

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

@@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options

@@ -20,7 +20,6 @@ EXE_LIBS = \
     -lsampling \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lreactionThermophysicalModels \
     -lspecie \
     -lcompressibleTransportModels \

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

@@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/compressible/rhoCentralFoam/Make/options

@@ -19,6 +19,5 @@ EXE_LIBS = \
     -lrhoCentralFoam \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh

applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options

@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -17,5 +17,4 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels

applications/solvers/compressible/rhoPimpleFoam/Make/options

@@ -9,7 +9,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/regionFaModels\lnInclude
+    -I$(LIB_SRC)/regionFaModels/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -20,11 +20,9 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -ldynamicMesh \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -lsampling \
     -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels

applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options

@@ -21,7 +21,6 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -loverset

applications/solvers/compressible/rhoSimpleFoam/Make/options

@@ -7,7 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/regionFaModels\lnInclude
+    -I$(LIB_SRC)/regionFaModels/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -19,7 +19,5 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels

applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options

@@ -21,7 +21,6 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -lsampling \

applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createUpdatedDynamicFvMesh.H

@@ -1,52 +1,22 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+    Info<< "Create dynamic mesh for time = "
+        << runTime.timeName() << nl << endl;
 
-Description
-    Create a dynamicFvMesh, with init()
-
-Required Variables
-    - runTime [Time]
-
-Provided Variables
-    - mesh [dynamicFvMesh], meshPtr
-
-\*---------------------------------------------------------------------------*/
-
-Foam::autoPtr<Foam::dynamicFvMesh> meshPtr;
-
-{
-    Foam::Info << "Create dynamic mesh for time = "
-        << runTime.timeName() << Foam::nl;
-
-    meshPtr = dynamicFvMesh::New
+    autoPtr<dynamicFvMesh> meshPtr
     (
-        IOobject
+        dynamicFvMesh::New
         (
-            polyMesh::defaultRegion,
-            runTime.timeName(),
-            runTime,
-            IOobject::MUST_READ
+            IOobject
+            (
+                polyMesh::defaultRegion,
+                runTime.timeName(),
+                runTime,
+                IOobject::MUST_READ
+            )
         )
     );
-}
 
+    dynamicFvMesh& mesh = meshPtr();
 
-dynamicFvMesh& mesh = meshPtr();
-
-// Calculate initial mesh-to-mesh mapping. Note that this should be
-// done under the hood, e.g. as a MeshObject
-mesh.update();
-
-Foam::Info << Foam::endl;
-
-
-// ************************************************************************* //
+    // Calculate initial mesh-to-mesh mapping. Note that this should be
+    // done under the hood, e.g. as a MeshObject
+    mesh.update();

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options

@@ -18,5 +18,4 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels

applications/solvers/compressible/sonicFoam/Make/options

@@ -16,5 +16,4 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels

applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options

@@ -21,7 +21,6 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -ldynamicMesh \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \

applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options

@@ -10,7 +10,7 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/regionFaModels\lnInclude
+    -I$(LIB_SRC)/regionFaModels/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -23,10 +23,8 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -latmosphericModels \
     -ldynamicMesh \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels

applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options

@@ -24,7 +24,6 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -latmosphericModels \
     -loverset \
     -ldynamicFvMesh \

applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options

@@ -7,7 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/regionFaModels\lnInclude
+    -I$(LIB_SRC)/regionFaModels/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -20,7 +20,5 @@ EXE_LIBS = \
     -lradiationModels \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels

applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options

@@ -19,7 +19,7 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionFaModels\lnInclude
+    -I$(LIB_SRC)/regionFaModels/lnInclude
 
 
 EXE_LIBS = \
@@ -37,8 +37,6 @@ EXE_LIBS = \
     -lcombustionModels \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lradiationModels \
     -lregionModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2019,2022 OpenCFD Ltd.
+    Copyright (C) 2017-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -70,7 +70,6 @@ int main(int argc, char *argv[])
     #define CREATE_MESH createMeshesPostProcess.H
     #include "postProcess.H"
 
-    #include "addCheckCaseOptions.H"
     #include "setRootCaseLists.H"
     #include "createTime.H"
     #include "createMeshes.H"

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options

@@ -30,11 +30,10 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lradiationModels \
     -lfvOptions \
     -lfaOptions \
     -lregionModels \
     -lsampling \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
+

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2019,2022 OpenCFD Ltd.
+    Copyright (C) 2017-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,7 +62,6 @@ int main(int argc, char *argv[])
     #define CREATE_MESH createMeshesPostProcess.H
     #include "postProcess.H"
 
-    #include "addCheckCaseOptions.H"
     #include "setRootCaseLists.H"
     #include "createTime.H"
     #include "createMeshes.H"

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

@@ -4,61 +4,21 @@
 
     forAll(fluidNames, i)
     {
-        if (args.dryRun() || args.found("dry-run-write"))
-        {
-            Info
-                << "Operating in 'dry-run' mode:"
-                << " case will run for 1 time step.  "
-                << "All checks assumed OK on a clean exit" << endl;
+        Info<< "Create fluid mesh for region " << fluidNames[i]
+            << " for time = " << runTime.timeName() << nl << endl;
 
-            FieldBase::allowConstructFromLargerSize = true;
-
-            // Create a simplified 1D mesh and attempt to re-create boundary
-            // conditions
-            fluidRegions.set
+        fluidRegions.set
+        (
+            i,
+            new fvMesh
             (
-                i,
-                new simplifiedMeshes::columnFvMesh(runTime, fluidNames[i])
-            );
-
-            // Stop after 1 iteration of the simplified mesh
-
-            if (args.found("dry-run-write"))
-            {
-                // Using saWriteNow triggers function objects execute(), write()
-                runTime.stopAt(Time::saWriteNow);
-
-                // Make sure mesh gets output to the current time (since
-                // instance no longer constant)
-                fluidRegions[i].setInstance(runTime.timeName());
-            }
-            else
-            {
-                // Using saNoWriteNow triggers function objects execute(),
-                // but not write()
-                runTime.stopAt(Time::saNoWriteNow);
-            }
-
-            functionObject::outputPrefix = "postProcessing-dry-run";
-        }
-        else
-        {
-            Info<< "Create fluid mesh for region " << fluidNames[i]
-                << " for time = " << runTime.timeName() << nl << endl;
-
-            fluidRegions.set
-            (
-                i,
-                new fvMesh
+                IOobject
                 (
-                    IOobject
-                    (
-                        fluidNames[i],
-                        runTime.timeName(),
-                        runTime,
-                        IOobject::MUST_READ
-                    )
+                    fluidNames[i],
+                    runTime.timeName(),
+                    runTime,
+                    IOobject::MUST_READ
                 )
-            );
-        }
+            )
+        );
     }

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

@@ -67,7 +67,6 @@ int main(int argc, char *argv[])
     #define CREATE_MESH createMeshesPostProcess.H
     #include "postProcess.H"
 
-    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMeshes.H"

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

@@ -4,61 +4,21 @@
 
     forAll(fluidNames, i)
     {
-        if (args.dryRun() || args.found("dry-run-write"))
-        {
-            Info
-                << "Operating in 'dry-run' mode:"
-                << " case will run for 1 time step.  "
-                << "All checks assumed OK on a clean exit" << endl;
+        Info<< "Create fluid mesh for region " << fluidNames[i]
+            << " for time = " << runTime.timeName() << nl << endl;
 
-            FieldBase::allowConstructFromLargerSize = true;
-
-            // Create a simplified 1D mesh and attempt to re-create boundary
-            // conditions
-            fluidRegions.set
+        fluidRegions.set
+        (
+            i,
+            new fvMesh
             (
-                i,
-                new simplifiedMeshes::columnFvMesh(runTime, fluidNames[i])
-            );
-
-            // Stop after 1 iteration of the simplified mesh
-
-            if (args.found("dry-run-write"))
-            {
-                // Using saWriteNow triggers function objects execute(), write()
-                runTime.stopAt(Time::saWriteNow);
-
-                // Make sure mesh gets output to the current time (since
-                // instance no longer constant)
-                fluidRegions[i].setInstance(runTime.timeName());
-            }
-            else
-            {
-                // Using saNoWriteNow triggers function objects execute(),
-                // but not write()
-                runTime.stopAt(Time::saNoWriteNow);
-            }
-
-            functionObject::outputPrefix = "postProcessing-dry-run";
-        }
-        else
-        {
-            Info<< "Create fluid mesh for region " << fluidNames[i]
-                << " for time = " << runTime.timeName() << nl << endl;
-
-            fluidRegions.set
-            (
-                i,
-                new fvMesh
+                IOobject
                 (
-                    IOobject
-                    (
-                        fluidNames[i],
-                        runTime.timeName(),
-                        runTime,
-                        IOobject::MUST_READ
-                    )
+                    fluidNames[i],
+                    runTime.timeName(),
+                    runTime,
+                    IOobject::MUST_READ
                 )
-            );
-        }
+            )
+        );
     }

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

@@ -12,15 +12,15 @@
     if (Y.size())
     {
         const word inertSpecie(thermo.get<word>("inertSpecie"));
-        inertIndex = composition.species().find(inertSpecie);
-        if (inertIndex < 0)
+        if (!composition.species().found(inertSpecie))
         {
             FatalIOErrorIn(args.executable().c_str(), thermo)
                 << "Inert specie " << inertSpecie
                 << " not found in available species "
-                << flatOutput(composition.species())
+                << composition.species()
                 << exit(FatalIOError);
         }
+        inertIndex = composition.species()[inertSpecie];
     }
 
     volScalarField& rho = rhoFluid[i];

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

@@ -35,7 +35,7 @@
                 (
                     solidRegions[i],
                     thermos[i],
-                    coordinateSystem::typeName
+                    coordinateSystem::typeName_()
                 )
             );
 

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

@@ -4,67 +4,26 @@
 
     forAll(solidNames, i)
     {
-        if (args.dryRun() || args.found("dry-run-write"))
-        {
-            Info
-                << "Operating in 'dry-run' mode:"
-                << " case will run for 1 time step.  "
-                << "All checks assumed OK on a clean exit" << endl;
+        Info<< "Create solid mesh for region " << solidNames[i]
+            << " for time = " << runTime.timeName() << nl << endl;
 
-            FieldBase::allowConstructFromLargerSize = true;
-
-            // Create a simplified 1D mesh and attempt to re-create boundary
-            // conditions
-            solidRegions.set
+        solidRegions.set
+        (
+            i,
+            new fvMesh
             (
-                i,
-                new simplifiedMeshes::columnFvMesh(runTime, solidNames[i])
-            );
-
-            // Stop after 1 iteration of the simplified mesh
-
-            if (args.found("dry-run-write"))
-            {
-                // Using saWriteNow triggers function objects execute(), write()
-                runTime.stopAt(Time::saWriteNow);
-
-                // Make sure mesh gets output to the current time (since
-                // instance no longer constant)
-                solidRegions[i].setInstance(runTime.timeName());
-            }
-            else
-            {
-                // Using saNoWriteNow triggers function objects execute(),
-                // but not write()
-                runTime.stopAt(Time::saNoWriteNow);
-            }
-
-            functionObject::outputPrefix = "postProcessing-dry-run";
-        }
-        else
-        {
-            Info<< "Create solid mesh for region " << solidNames[i]
-                << " for time = " << runTime.timeName() << nl << endl;
-
-            solidRegions.set
-            (
-                i,
-                new fvMesh
+                IOobject
                 (
-                    IOobject
-                    (
-                        solidNames[i],
-                        runTime.timeName(),
-                        runTime,
-                        IOobject::MUST_READ
-                    )
+                    solidNames[i],
+                    runTime.timeName(),
+                    runTime,
+                    IOobject::MUST_READ
                 )
-            );
+            )
+        );
 
-            // Force calculation of geometric properties to prevent it being
-            // done
-            // later in e.g. some boundary evaluation
-            //(void)solidRegions[i].weights();
-            //(void)solidRegions[i].deltaCoeffs();
-        }
+        // Force calculation of geometric properties to prevent it being done
+        // later in e.g. some boundary evaluation
+        //(void)solidRegions[i].weights();
+        //(void)solidRegions[i].deltaCoeffs();
     }

applications/solvers/heatTransfer/solidFoam/Make/files

@@ -1,4 +1,3 @@
-solidRegionDiffNo.C
 solidFoam.C
 
 EXE = $(FOAM_APPBIN)/solidFoam

applications/solvers/heatTransfer/solidFoam/Make/options

@@ -1,6 +1,4 @@
 EXE_INC = \
-    -I../chtMultiRegionFoam/include \
-    -I../chtMultiRegionFoam/solid \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
@@ -23,5 +21,4 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lsolidThermo \
     -lradiationModels \
-    -lspecie \
-    -lthermoTools
+    -lspecie

applications/solvers/heatTransfer/solidFoam/createFields.H

@@ -15,7 +15,7 @@ if (!thermo.isotropic())
     (
         mesh,
         thermo,
-        coordinateSystem::typeName
+        coordinateSystem::typeName_()
     );
 
     tmp<volVectorField> tkappaByCp = thermo.Kappa()/thermo.Cp();

applications/solvers/heatTransfer/solidFoam/dummyCourantNo.H

@@ -1,36 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    CourantNo
-
-Description
-    Dummy (fluid) Courant number.
-
-\*---------------------------------------------------------------------------*/
-
-scalar CoNum = 0.0;
-
-// ************************************************************************* //

applications/solvers/heatTransfer/solidFoam/solidDiffusionNo.H

@@ -1,31 +0,0 @@
-scalar DiNum = -GREAT;
-
-{
-    tmp<volScalarField> magKappa;
-    if (thermo.isotropic())
-    {
-        magKappa = thermo.kappa();
-    }
-    else
-    {
-        magKappa = mag(thermo.Kappa());
-    }
-
-    tmp<volScalarField> tcp = thermo.Cp();
-    const volScalarField& cp = tcp();
-
-    tmp<volScalarField> trho = thermo.rho();
-    const volScalarField& rho = trho();
-
-    DiNum = max
-    (
-        solidRegionDiffNo
-        (
-            mesh,
-            runTime,
-            rho*cp,
-            magKappa()
-        ),
-        DiNum
-    );
-}

applications/solvers/heatTransfer/solidFoam/solidFoam.C

@@ -41,8 +41,6 @@ Description
 #include "fvOptions.H"
 #include "simpleControl.H"
 #include "pimpleControl.H"
-#include "dummyCourantNo.H"
-#include "solidRegionDiffNo.H"
 #include "coordinateSystem.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -90,31 +88,17 @@ int main(int argc, char *argv[])
     {
         pimpleControl pimple(mesh);
 
-        #include "createDyMControls.H"
-
         while (runTime.run())
         {
-            #include "readDyMControls.H"
-            #include "readSolidTimeControls.H"
-
-            #include "solidDiffusionNo.H"
-            #include "setMultiRegionDeltaT.H"
-
             ++runTime;
 
             Info<< "Time = " << runTime.timeName() << nl << endl;
 
             while (pimple.loop())
             {
-                if (pimple.firstIter() || moveMeshOuterCorrectors)
+                if (pimple.firstIter())
                 {
-                    // Do any mesh changes
-                    mesh.controlledUpdate();
-
-                    if (mesh.changing() && checkMeshCourantNo)
-                    {
-                        #include "meshCourantNo.H"
-                    }
+                    mesh.update();
                 }
 
                 while (pimple.correct())

applications/solvers/heatTransfer/solidFoam/solidRegionDiffNo.C

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

applications/solvers/heatTransfer/solidFoam/solidRegionDiffNo.H

@@ -1 +0,0 @@
-../chtMultiRegionFoam/solid/solidRegionDiffNo.H

applications/solvers/heatTransfer/thermoFoam/Make/options

@@ -18,5 +18,4 @@ EXE_LIBS = \
     -lradiationModels \
     -lspecie \
     -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels

applications/solvers/incompressible/adjointOptimisationFoam/adjointOptimisationFoam.C

@@ -5,8 +5,8 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2007-2021 PCOpt/NTUA
-    Copyright (C) 2013-2021 FOSS GP
+    Copyright (C) 2007-2019 PCOpt/NTUA
+    Copyright (C) 2013-2019 FOSS GP
     Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@@ -71,6 +71,9 @@ int main(int argc, char *argv[])
 
         // Solve all adjoint equations
         om.solveAdjointEquations();
+
+        // Compute all sensitivities
+        om.computeSensitivities();
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/pimpleFoam/Make/options

@@ -8,7 +8,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/regionFaModels\lnInclude
+    -I$(LIB_SRC)/regionFaModels/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -22,5 +22,4 @@ EXE_LIBS = \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels

applications/solvers/incompressible/shallowWaterFoam/createFields.H

@@ -20,7 +20,7 @@ volScalarField h0
     IOobject
     (
         "h0",
-        runTime.findInstance(polyMesh::meshSubDir, "points"),
+        runTime.findInstance("polyMesh", "points"),
         mesh,
         IOobject::READ_IF_PRESENT
     ),

applications/solvers/incompressible/simpleFoam/overSimpleFoam/createUpdatedDynamicFvMesh.H

@@ -1,52 +1,22 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+    Info<< "Create dynamic mesh for time = "
+        << runTime.timeName() << nl << endl;
 
-Description
-    Create a dynamicFvMesh, with init()
-
-Required Variables
-    - runTime [Time]
-
-Provided Variables
-    - mesh [dynamicFvMesh], meshPtr
-
-\*---------------------------------------------------------------------------*/
-
-Foam::autoPtr<Foam::dynamicFvMesh> meshPtr;
-
-{
-    Foam::Info << "Create dynamic mesh for time = "
-        << runTime.timeName() << Foam::nl;
-
-    meshPtr = dynamicFvMesh::New
+    autoPtr<dynamicFvMesh> meshPtr
     (
-        IOobject
+        dynamicFvMesh::New
         (
-            polyMesh::defaultRegion,
-            runTime.timeName(),
-            runTime,
-            IOobject::MUST_READ
+            IOobject
+            (
+                polyMesh::defaultRegion,
+                runTime.timeName(),
+                runTime,
+                IOobject::MUST_READ
+            )
         )
     );
-}
 
+    dynamicFvMesh& mesh = meshPtr();
 
-dynamicFvMesh& mesh = meshPtr();
-
-// Calculate initial mesh-to-mesh mapping. Note that this should be
-// done under the hood, e.g. as a MeshObject
-mesh.update();
-
-Foam::Info << Foam::endl;
-
-
-// ************************************************************************* //
+    // Calculate initial mesh-to-mesh mapping. Note that this should be
+    // done under the hood, e.g. as a MeshObject
+    mesh.update();

applications/solvers/lagrangian/coalChemistryFoam/Make/options

@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -31,7 +31,6 @@ EXE_LIBS = \
     -lmeshTools \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \

applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H

@@ -1,4 +1,4 @@
 const volScalarField& T = thermo.T();
 const volScalarField& psi = thermo.psi();
 
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/lagrangian/reactingParcelFoam/Make/options

@@ -2,10 +2,10 @@ EXE_INC = \
     -I../reactingParcelFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@@ -36,7 +36,6 @@ EXE_LIBS = \
     -lsampling \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \

applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H

@@ -1,4 +1,4 @@
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);
 
 const volScalarField& T = thermo.T();
 const volScalarField& psi = thermo.psi();

applications/solvers/lagrangian/reactingParcelFoam/createMeshesPostProcess.H

@@ -1,35 +1,27 @@
 #include "createMesh.H"
 
-dictionary filmDict;
-
-IOobject io
+IOdictionary filmDict
 (
-    "surfaceFilmProperties",
-    mesh.time().constant(),
-    mesh,
-    IOobject::READ_IF_PRESENT,
-    IOobject::NO_WRITE,
-    false
+    IOobject
+    (
+        "surfaceFilmProperties",
+        runTime.constant(),
+        runTime,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    )
 );
 
-if (io.typeHeaderOk<IOdictionary>())
-{
-    IOdictionary propDict(io);
+const word filmRegionName = filmDict.get<word>("region");
 
-    filmDict = std::move(propDict);
-
-    const word filmRegionName = filmDict.get<word>("region");
-
-    fvMesh filmMesh
+fvMesh filmMesh
+(
+    IOobject
     (
-        IOobject
-        (
-            filmRegionName,
-            runTime.timeName(),
-            runTime,
-            IOobject::MUST_READ
-        )
-    );
-}
-
-
+        filmRegionName,
+        runTime.timeName(),
+        runTime,
+        IOobject::MUST_READ
+    )
+);

applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options

@@ -2,8 +2,8 @@ EXE_INC = \
     -I.. \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
@@ -36,7 +36,6 @@ EXE_LIBS = \
     -ldynamicFvMesh \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options

@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
@@ -31,7 +31,6 @@ EXE_LIBS = \
     -lmeshTools \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFieldRefs.H

@@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options

@@ -2,7 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -31,7 +31,6 @@ EXE_LIBS = \
     -lmeshTools \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \

applications/solvers/lagrangian/simpleCoalParcelFoam/createFieldRefs.H

@@ -1,3 +1,3 @@
 const volScalarField& psi = thermo.psi();
 const volScalarField& T = thermo.T();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/lagrangian/sprayFoam/Make/options

@@ -2,8 +2,8 @@ EXE_INC = \
     -I../reactingParcelFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -31,7 +31,6 @@ EXE_LIBS = \
     -lmeshTools \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \

applications/solvers/lagrangian/sprayFoam/createFieldRefs.H

@@ -1,3 +1,3 @@
 const volScalarField& T = thermo.T();
 const volScalarField& psi = thermo.psi();
-const label inertIndex(composition.species().find(inertSpecie));
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options

@@ -4,8 +4,8 @@ EXE_INC = \
     -I../../reactingParcelFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -35,7 +35,6 @@ EXE_LIBS = \
     -lsampling \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \

applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options

@@ -2,7 +2,7 @@ EXE_INC = \
     -I$(FOAM_SOLVERS)/lagrangian/reactingParcelFoam/simpleReactingParcelFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
@@ -31,7 +31,6 @@ EXE_LIBS = \
     -lmeshTools \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianSpray \

applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options

@@ -4,8 +4,8 @@ EXE_INC = \
     -I../../../compressible/rhoPimpleFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -36,7 +36,6 @@ EXE_LIBS = \
     -lmeshTools \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \

applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options

@@ -29,7 +29,6 @@ EXE_LIBS = \
     -lradiationModels \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lregionModels \
     -lsurfaceFilmModels \
     -lregionFaModels \

applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options

@@ -32,7 +32,6 @@ EXE_LIBS = \
     -lradiationModels \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lregionModels \
     -lsurfaceFilmModels \
     -ldynamicMesh \

applications/solvers/multiphase/MPPICInterFoam/Make/options

@@ -35,12 +35,10 @@ EXE_LIBS = \
     -lspecie \
     -lincompressibleTransportModels \
     -limmiscibleIncompressibleTwoPhaseMixture \
-    -ltwoPhaseProperties \
     -linterfaceProperties \
     -lturbulenceModels \
     -lsampling \
     -lregionModels \
     -lregionFaModels \
     -lsurfaceFilmModels \
-    -lfiniteArea \
     -lcompressibleTwoPhaseMixtureTurbulenceModels

applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options

@@ -19,9 +19,7 @@ LIB_LIBS = \
     -lmeshTools \
     -lincompressibleTransportModels \
     -limmiscibleIncompressibleTwoPhaseMixture \
-    -ltwoPhaseProperties \
     -linterfaceProperties \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels

applications/solvers/multiphase/compressibleInterFoam/Make/options

@@ -26,5 +26,4 @@ EXE_LIBS = \
     -linterfaceProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lVoFphaseCompressibleTurbulenceModels

applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options

@@ -1,18 +1,16 @@
 EXE_INC = \
     -I../twoPhaseMixtureThermo \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
+    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
     -ltwoPhaseMixtureThermo \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
@@ -22,5 +20,6 @@ LIB_LIBS = \
     -linterfaceProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
-    -lincompressibleTransportModels
+    -lincompressibleTransportModels \
+    -lfiniteVolume \
+    -lmeshTools

applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options

@@ -29,7 +29,6 @@ EXE_LIBS = \
     -linterfaceProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lVoFphaseCompressibleTurbulenceModels \
     -ldynamicMesh \
     -ldynamicFvMesh

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options

@@ -36,7 +36,6 @@ EXE_LIBS = \
     -linterfaceProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lVoFphaseCompressibleTurbulenceModels \
     -lSLGThermo \
     -lsurfaceFilmModels \

applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options

@@ -26,7 +26,6 @@ EXE_LIBS = \
     -ldynamicMesh \
     -ldynamicFvMesh \
     -ltwoPhaseMixtureThermo \
-    -ltwoPhaseProperties \
     -ltwoPhaseSurfaceTension \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
@@ -36,6 +35,5 @@ EXE_LIBS = \
     -linterfaceProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lVoFphaseCompressibleTurbulenceModels \
     -lgeometricVoF

applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options

@@ -32,7 +32,6 @@ EXE_LIBS = \
     -linterfaceProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lVoFphaseCompressibleTurbulenceModels \
     -ldynamicMesh \
     -ldynamicFvMesh \

applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options

@@ -21,5 +21,4 @@ EXE_LIBS = \
     -lspecie \
     -linterfaceProperties \
     -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels

applications/solvers/multiphase/driftFluxFoam/Make/options

@@ -22,5 +22,4 @@ EXE_LIBS = \
     -ldriftFluxTransportModels \
     -ldriftFluxRelativeVelocityModels \
     -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lthermoTools
+    -lcompressibleTurbulenceModels

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options

@@ -25,7 +25,6 @@ EXE_LIBS = \
     -ldynamicFvMesh \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lthermoTools \
     -lcompressibleTransportModels \
     -lradiationModels \
     -lfluidThermophysicalModels \

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/YEqns.H

@@ -1,5 +1,5 @@
 {
-    for (multiphaseInter::phaseModel& phase : fluid.phases())
+    for (phaseModel& phase : fluid.phases())
     {
         PtrList<volScalarField>& Y = phase.Y();
 

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/createFields.H

@@ -63,10 +63,9 @@
 
 
     Info<< "Creating multiphaseSystem\n" << endl;
-    autoPtr<multiphaseInter::multiphaseSystem> fluidPtr =
-        multiphaseInter::multiphaseSystem::New(mesh);
+    autoPtr<multiphaseSystem> fluidPtr = multiphaseSystem::New(mesh);
 
-    multiphaseInter::multiphaseSystem& fluid = fluidPtr();
+    multiphaseSystem& fluid = fluidPtr();
 
     if (!fluid.incompressible())
     {
@@ -119,12 +118,9 @@
     surfaceScalarField& rhoPhi = fluid.rhoPhi();
 
     // Construct incompressible turbulence model
-    autoPtr
-    <
-        CompressibleTurbulenceModel<multiphaseInter::multiphaseSystem>
-    > turbulence
+    autoPtr<CompressibleTurbulenceModel<multiphaseSystem>> turbulence
     (
-        CompressibleTurbulenceModel<multiphaseInter::multiphaseSystem>::New
+        CompressibleTurbulenceModel<multiphaseSystem>::New
         (
             rho,
             U,
@@ -133,8 +129,6 @@
         )
     );
 
-    fluid.setTurbulence(turbulence());
-
     // Creating radiation model
     autoPtr<radiation::radiationModel> radiation
     (

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticle.C

@@ -106,6 +106,7 @@ bool Foam::DTRMParticle::move
         //Cache old data of particle to use for reflected particle
         const point pos0 = position();
         const label cell1 = cell();
+        const tetIndices tetIs = this->currentTetIndices();
 
         scalar f = 1 - stepFraction();
         const vector s = p1() - p0() - deviationFromMeshCentre();

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticle.H

@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_DTRMParticle_H
-#define Foam_DTRMParticle_H
+#ifndef DTRMParticle_H
+#define DTRMParticle_H
 
 #include "particle.H"
 #include "IOstream.H"
@@ -50,13 +50,12 @@ SourceFiles
 namespace Foam
 {
 
-// Forward Declarations
 class DTRMParticle;
-
-Ostream& operator<<(Ostream&, const DTRMParticle&);
-
 using namespace Foam::radiation;
 
+// Forward declaration of friend functions
+Ostream& operator<<(Ostream&, const DTRMParticle&);
+
 /*---------------------------------------------------------------------------*\
                         Class DTRMParticle Declaration
 \*---------------------------------------------------------------------------*/
@@ -131,7 +130,7 @@ public:
             );
 
 
-        // Member Functions
+        // Member functions
 
             inline const interpolationCell<scalar>& aInterp() const;
             inline const interpolationCell<scalar>& eInterp() const;
@@ -233,34 +232,37 @@ public:
     // Access
 
         //- Return const access to the initial position
-        const point& p0() const noexcept { return p0_; }
+        inline const point& p0() const;
 
         //- Return const access to the target position
-        const point& p1() const noexcept { return p1_; }
+        inline const point& p1() const;
 
         //- Return const access to the initial intensity
-        scalar I0() const noexcept { return I0_; }
+        inline scalar I0() const;
 
         //- Return const access to the current intensity
-        scalar I() const noexcept { return I_; }
+        inline scalar I() const;
 
         //- Return const access dA
-        scalar dA() const noexcept { return dA_; }
+        inline scalar dA() const;
 
 
     // Edit
 
         //- Return access to the target position
-        point& p1() noexcept { return p1_; }
+        inline point& p1();
 
         //- Return access to the initial intensity
-        scalar& I0() noexcept { return I0_; }
+        inline scalar& I0();
 
         //- Return access to the current intensity
-        scalar& I() noexcept { return I_; }
+        inline scalar& I();
 
         //- Return access to dA
-        scalar& dA() noexcept { return dA_; }
+        inline scalar& dA();
+
+        //- Return access to reflectedId
+        inline label& reflectedId();
 
 
    // Tracking

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticleI.H

@@ -107,4 +107,58 @@ inline Foam::scalar& Foam::DTRMParticle::trackingData::Q(label celli)
 }
 
 
+inline const Foam::point& Foam::DTRMParticle::p0() const
+{
+    return p0_;
+}
+
+
+inline const Foam::point& Foam::DTRMParticle::p1() const
+{
+    return p1_;
+}
+
+
+inline Foam::scalar Foam::DTRMParticle::I0() const
+{
+    return I0_;
+}
+
+
+inline Foam::scalar Foam::DTRMParticle::I() const
+{
+    return I_;
+}
+
+
+inline Foam::scalar Foam::DTRMParticle::dA() const
+{
+    return dA_;
+}
+
+
+inline Foam::scalar& Foam::DTRMParticle::dA()
+{
+    return dA_;
+}
+
+
+inline Foam::point& Foam::DTRMParticle::p1()
+{
+    return p1_;
+}
+
+
+inline Foam::scalar& Foam::DTRMParticle::I0()
+{
+    return I0_;
+}
+
+
+inline Foam::scalar& Foam::DTRMParticle::I()
+{
+    return I_;
+}
+
+
 // ************************************************************************* //

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticleIO.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,7 +59,7 @@ Foam::DTRMParticle::DTRMParticle
 {
     if (readFields)
     {
-        if (is.format() == IOstreamOption::ASCII)
+        if (is.format() == IOstream::ASCII)
         {
             is >> p0_ >> p1_ >> I0_ >> I_ >> dA_ >> transmissiveId_;
         }
@@ -115,7 +115,7 @@ void Foam::DTRMParticle::writeProperties
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const DTRMParticle& p)
 {
-    if (os.format() == IOstreamOption::ASCII)
+    if (os.format() == IOstream::ASCII)
     {
         os  << static_cast<const particle&>(p)
             << token::SPACE << p.p0_

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/Make/options

@@ -3,14 +3,12 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/multiphaseInter
 EXE_INC = \
     -I${phaseSystem}/phasesSystem/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
-    -lfileFormats \
     -lmeshTools \
     -llagrangian \
     -lradiationModels \

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,12 +31,11 @@ License
 #include "absorptionEmissionModel.H"
 #include "scatterModel.H"
 #include "constants.H"
+#include "addToRunTimeSelectionTable.H"
 #include "unitConversion.H"
 #include "interpolationCell.H"
 #include "interpolationCellPoint.H"
 #include "Random.H"
-#include "OBJstream.H"
-#include "addToRunTimeSelectionTable.H"
 
 using namespace Foam::constant;
 
@@ -157,7 +156,12 @@ void Foam::radiation::laserDTRM::initialiseReflection()
             );
         }
 
-        reflectionSwitch_ = returnReduceOr(reflections_.size());
+        if (reflections_.size())
+        {
+            reflectionSwitch_ = true;
+        }
+
+        reflectionSwitch_ = returnReduce(reflectionSwitch_, orOp<bool>());
     }
 }
 
@@ -294,12 +298,14 @@ void Foam::radiation::laserDTRM::initialise()
                     DTRMCloud_.addParticle(pPtr);
                 }
 
-                if (nMissed < 10 && returnReduceAnd(cellI < 0))
+                if (returnReduce(cellI, maxOp<label>()) == -1)
                 {
-                    ++nMissed;
-                    WarningInFunction
-                        << "Cannot find owner cell for focalPoint at "
-                        << p0 << endl;
+                    if (++nMissed <= 10)
+                    {
+                        WarningInFunction
+                            << "Cannot find owner cell for focalPoint at "
+                            << p0 << endl;
+                    }
                 }
             }
         }
@@ -673,28 +679,44 @@ void Foam::radiation::laserDTRM::calculate()
         Info<< "Final number of particles..."
             << returnReduce(DTRMCloud_.size(), sumOp<label>()) << endl;
 
-        pointField lines(2*DTRMCloud_.size());
+        OFstream osRef(type() + ":particlePath.obj");
+        label vertI = 0;
+
+        List<pointField> positions(Pstream::nProcs());
+        List<pointField> p0(Pstream::nProcs());
+
+        DynamicList<point>  positionsMyProc;
+        DynamicList<point>  p0MyProc;
+
+        for (const DTRMParticle& p : DTRMCloud_)
         {
-            label i = 0;
-            for (const DTRMParticle& p : DTRMCloud_)
+            positionsMyProc.append(p.position());
+            p0MyProc.append(p.p0());
+        }
+
+        positions[Pstream::myProcNo()].transfer(positionsMyProc);
+        p0[Pstream::myProcNo()].transfer(p0MyProc);
+
+        Pstream::gatherList(positions);
+        Pstream::scatterList(positions);
+        Pstream::gatherList(p0);
+        Pstream::scatterList(p0);
+
+        for (const int proci : Pstream::allProcs())
+        {
+            const pointField& pos = positions[proci];
+            const pointField& pfinal = p0[proci];
+            forAll(pos, i)
             {
-                lines[i] = p.position();
-                lines[i+1] = p.p0();
-                i += 2;
+                meshTools::writeOBJ(osRef, pos[i]);
+                vertI++;
+                meshTools::writeOBJ(osRef, pfinal[i]);
+                vertI++;
+                osRef << "l " << vertI-1 << ' ' << vertI << nl;
             }
         }
 
-        globalIndex::gatherInplaceOp(lines);
-
-        if (Pstream::master())
-        {
-            OBJstream os(type() + ":particlePath.obj");
-
-            for (label pointi = 0; pointi < lines.size(); pointi += 2)
-            {
-                os.writeLine(lines[pointi], lines[pointi+1]);
-            }
-        }
+        osRef.flush();
 
         scalar totalQ = gSum(Q_.primitiveFieldRef()*mesh_.V());
         Info << "Total energy absorbed [W]: " << totalQ << endl;

applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options

@@ -28,8 +28,8 @@ EXE_LIBS = \
     -ldynamicFvMesh \
     -lphaseTemperatureChangeTwoPhaseMixtures \
     -ltwoPhaseMixture \
-    -ltwoPhaseProperties \
     -linterfaceProperties \
+    -ltwoPhaseProperties \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options

@@ -13,7 +13,7 @@ LIB_LIBS = \
     -lmeshTools \
     -lgeometricVoF \
     -ltwoPhaseMixture \
-    -ltwoPhaseProperties \
     -linterfaceProperties \
+    -ltwoPhaseProperties \
     -lincompressibleTransportModels \
     -lfluidThermophysicalModels

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
     Copyright (C) 2020 Henning Scheufler
 -------------------------------------------------------------------------------
 License
@@ -265,13 +265,23 @@ correct()
     const dimensionedScalar& TSat = thermo.TSat();
     const dimensionedScalar T0(dimTemperature, Zero);
 
-    const dimensionedScalar L(mag(mixture_.Hf2() - mixture_.Hf1()));
+    dimensionedScalar L = mixture_.Hf2() - mixture_.Hf1();
 
     // interface heat resistance
     mDotc_ = interfaceArea_*R_*max(TSat - T, T0)/L;
     mDote_ = interfaceArea_*R_*max(T - TSat, T0)/L;
 
+    // Limiting max condensation
+    forAll(mDotc_, celli)
+    {
+        scalar rhobyDt = mixture_.rho1().value()/mesh_.time().deltaTValue();
+        scalar maxEvap = mixture_.alpha1()[celli]*rhobyDt; // positive
+        scalar maxCond = -mixture_.alpha2()[celli]*rhobyDt; // negative
+        mDotc_[celli] = min(max(mDotc_[celli], maxCond), maxEvap);
+    }
+
     // Calculate the spread sources
+
     dimensionedScalar D
     (
         "D",

applications/solvers/multiphase/interFoam/Make/options

@@ -24,7 +24,6 @@ EXE_LIBS = \
     -lincompressibleTransportModels \
     -linterfaceProperties \
     -limmiscibleIncompressibleTwoPhaseMixture \
-    -ltwoPhaseProperties \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
     -lwaveModels \

applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options

@@ -23,7 +23,6 @@ EXE_LIBS = \
     -lincompressibleTransportModels \
     -linterfaceProperties \
     -limmiscibleIncompressibleTwoPhaseMixture \
-    -ltwoPhaseProperties \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
     -ldynamicMesh \

applications/solvers/multiphase/interIsoFoam/Make/options

@@ -33,7 +33,5 @@ EXE_LIBS = \
     -lincompressibleTurbulenceModels \
     -lwaveModels \
     -lgeometricVoF \
-    -ltwoPhaseMixture \
-    -ltwoPhaseProperties \
     -lVoFphaseTurbulentTransportModels \
     -lincompressibleInterPhaseTransportModels

applications/solvers/multiphase/interPhaseChangeFoam/Make/options

@@ -17,8 +17,8 @@ EXE_LIBS = \
     -lsampling \
     -lphaseChangeTwoPhaseMixtures \
     -ltwoPhaseMixture \
-    -ltwoPhaseProperties \
     -linterfaceProperties \
+    -ltwoPhaseProperties \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels