ENH: InterfaceCompositionModels: add new thermo types for kineticGasEvaporation

META-INFO/api-info

@@ -1,2 +1,2 @@
-api=2208
+api=2206
 patch=220907

applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/Make/options

@@ -3,7 +3,6 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/overset/lnInclude \
-    -I$(LIB_SRC)/overset/include/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \

applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/createFields.H

@@ -31,25 +31,3 @@
     Info<< "Reading diffusivity DT\n" << endl;
 
     dimensionedScalar DT("DT", dimViscosity, transportProperties);
-
-    bool oversetPatchErrOutput =
-        simple.dict().getOrDefault("oversetPatchErrOutput", false);
-
-    // Dummy phi for oversetPatchErrOutput
-    tmp<surfaceScalarField> tdummyPhi;
-    if (oversetPatchErrOutput)
-    {
-        tdummyPhi = tmp<surfaceScalarField>::New
-        (
-            IOobject
-            (
-                "dummyPhi",
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh,
-            dimensionedScalar(dimless, Zero)
-        );
-    }

applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/overLaplacianDyMFoam.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -58,7 +58,6 @@ Description
 #include "fvOptions.H"
 #include "simpleControl.H"
 #include "dynamicFvMesh.H"
-#include "oversetPatchPhiErr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -100,11 +99,6 @@ int main(int argc, char *argv[])
             fvOptions.constrain(TEqn);
             TEqn.solve();
             fvOptions.correct(T);
-
-            if (oversetPatchErrOutput)
-            {
-                oversetPatchPhiErr(TEqn, tdummyPhi.ref());
-            }
         }
 
         #include "write.H"

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

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd
+    Copyright (C) 2017 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -149,6 +149,7 @@ int main(int argc, char *argv[])
 
     mesh.update();
 
+    surfaceScalarField faceMask(localMin<scalar>(mesh).interpolate(cellMask));
 
     // Since solver contains no time loop it would never execute
     // function objects so do it ourselves

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

@@ -0,0 +1,4 @@
+bool ddtCorr
+(
+    pimple.dict().getOrDefault("ddtCorr", true)
+);

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

@@ -69,8 +69,6 @@ mesh.setFluxRequired(p.name());
 
 // Mask field for zeroing out contributions on hole cells
 #include "createCellMask.H"
-// Create bool field with interpolated cells
-#include "createInterpolatedCells.H"
 
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence

applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/overRhoPimpleDyMFoam.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,6 +43,7 @@ Description
 #include "dynamicFvMesh.H"
 #include "fluidThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "bound.H"
 #include "pimpleControl.H"
 #include "pressureControl.H"
 #include "CorrectPhi.H"
@@ -88,8 +89,10 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
+        #include "readControls.H"
         #include "readDyMControls.H"
 
+
         // Store divrhoU from the previous mesh so that it can be mapped
         // and used in correctPhi to ensure the corrected phi has the
         // same divergence
@@ -125,6 +128,7 @@ int main(int argc, char *argv[])
         {
             if (pimple.firstIter() || moveMeshOuterCorrectors)
             {
+
                 // Do any mesh changes
                 mesh.update();
 
@@ -133,22 +137,52 @@ int main(int argc, char *argv[])
                     MRF.update();
 
                     #include "setCellMask.H"
-                    #include "setInterpolatedCells.H"
-                    #include "correctRhoPhiFaceMask.H"
+
+                    const surfaceScalarField faceMaskOld
+                    (
+                        localMin<scalar>(mesh).interpolate(cellMask.oldTime())
+                    );
+
+                    // Zero Uf on old faceMask (H-I)
+                    rhoUf() *= faceMaskOld;
+
+                    surfaceVectorField rhoUfint(fvc::interpolate(rho*U));
+
+                    // Update Uf and phi on new C-I faces
+                    rhoUf() += (1-faceMaskOld)*rhoUfint;
+
+                    // Update Uf boundary
+                    forAll(rhoUf().boundaryField(), patchI)
+                    {
+                        rhoUf().boundaryFieldRef()[patchI] =
+                            rhoUfint.boundaryField()[patchI];
+                    }
+
+                    // Calculate absolute flux from the mapped surface velocity
+                    phi = mesh.Sf() & rhoUf();
 
                     if (correctPhi)
                     {
-                        // Corrects flux on separated regions
                         #include "correctPhi.H"
                     }
 
+                    // Zero phi on current H-I
+                    const surfaceScalarField faceMask
+                    (
+                        localMin<scalar>(mesh).interpolate(cellMask)
+                    );
+
+                    phi *= faceMask;
+                    U   *= cellMask;
+
                      // Make the fluxes relative to the mesh-motion
                     fvc::makeRelative(phi, rho, U);
 
-                    if (checkMeshCourantNo)
-                    {
-                        #include "meshCourantNo.H"
-                    }
+                }
+
+                if (checkMeshCourantNo)
+                {
+                    #include "meshCourantNo.H"
                 }
             }
 

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

@@ -25,6 +25,17 @@ surfaceScalarField phiHbyA
     fvc::interpolate(rho)*fvc::flux(HbyA)
 );
 
+if (ddtCorr)
+{
+    surfaceScalarField faceMaskOld
+    (
+        localMin<scalar>(mesh).interpolate(cellMask.oldTime())
+    );
+
+    phiHbyA +=
+        faceMaskOld*MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi, rhoUf));
+}
+
 fvc::makeRelative(phiHbyA, rho, U);
 MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
@@ -123,4 +134,8 @@ if (thermo.dpdt())
     }
 }
 
+surfaceScalarField faceMask
+(
+    localMin<scalar>(mesh).interpolate(cellMask)
+);
 phi *= faceMask;

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

@@ -0,0 +1,9 @@
+#include "readTimeControls.H"
+
+correctPhi = pimple.dict().getOrDefault("correctPhi", false);
+
+checkMeshCourantNo =
+    pimple.dict().getOrDefault("checkMeshCourantNo", false);
+
+
+ddtCorr = pimple.dict().getOrDefault("ddtCorr", true);

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

@@ -124,6 +124,3 @@ dimensionedScalar initialMass("initialMass", fvc::domainIntegrate(rho));
 
 // Mask field for zeroing out contributions on hole cells
 #include "createCellMask.H"
-
-// Create bool field with interpolated cells
-#include "createInterpolatedCells.H"

applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/overBuoyantPimpleDyMFoam.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,7 +50,6 @@ Description
 #include "CorrectPhi.H"
 #include "cellCellStencilObject.H"
 #include "localMin.H"
-#include "oversetAdjustPhi.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -87,6 +86,9 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
+        #include "readTimeControls.H"
+
+        #include "readControls.H"
         #include "readDyMControls.H"
 
         #include "compressibleCourantNo.H"
@@ -126,14 +128,45 @@ int main(int argc, char *argv[])
                     MRF.update();
 
                     #include "setCellMask.H"
-                    #include "setInterpolatedCells.H"
-                    #include "correctRhoPhiFaceMask.H"
+
+                    const surfaceScalarField faceMaskOld
+                    (
+                        localMin<scalar>(mesh).interpolate(cellMask.oldTime())
+                    );
+
+                    // Zero Uf on old faceMask (H-I)
+                    rhoUf() *= faceMaskOld;
+
+                    //fvc::correctRhoUf(rhoUfint, rho, U, phi);
+                    surfaceVectorField rhoUfint(fvc::interpolate(rho*U));
+
+                    // Update Uf and phi on new C-I faces
+                    rhoUf() += (1-faceMaskOld)*rhoUfint;
+
+                    // Update Uf boundary
+                    forAll(rhoUf().boundaryField(), patchI)
+                    {
+                        rhoUf().boundaryFieldRef()[patchI] =
+                            rhoUfint.boundaryField()[patchI];
+                    }
+
+                    // Calculate absolute flux from the mapped surface velocity
+                    phi = mesh.Sf() & rhoUf();
 
                     if (correctPhi)
                     {
                         #include "correctPhi.H"
                     }
 
+                    // Zero phi on current H-I
+                    const surfaceScalarField faceMask
+                    (
+                        localMin<scalar>(mesh).interpolate(cellMask)
+                    );
+
+                    phi *= faceMask;
+                    U   *= cellMask;
+
                      // Make the fluxes relative to the mesh-motion
                     fvc::makeRelative(phi, rho, U);
                 }

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

@@ -21,13 +21,16 @@ surfaceScalarField phiHbyA
     fvc::flux(rho*HbyA) + phig
 );
 
-if (adjustFringe)
+if (ddtCorr)
 {
-    fvc::makeRelative(phiHbyA,rho, U);
-    oversetAdjustPhi(phiHbyA, U);
-    fvc::makeAbsolute(phiHbyA,rho, U);
-}
+    surfaceScalarField faceMaskOld
+    (
+        localMin<scalar>(mesh).interpolate(cellMask.oldTime())
+    );
 
+    phiHbyA +=
+        faceMaskOld*MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi));
+}
 
 MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
@@ -119,4 +122,8 @@ if (thermo.dpdt())
     }
 }
 
+surfaceScalarField faceMask
+(
+    localMin<scalar>(mesh).interpolate(cellMask)
+);
 phi *= faceMask;

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

@@ -0,0 +1,9 @@
+#include "readTimeControls.H"
+
+correctPhi = pimple.dict().getOrDefault("correctPhi", false);
+
+checkMeshCourantNo =
+    pimple.dict().getOrDefault("checkMeshCourantNo", false);
+
+
+ddtCorr = pimple.dict().getOrDefault("ddtCorr", true);

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/CourantNo.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,10 +37,7 @@ scalar meanCoNum = 0.0;
 
 if (mesh.nInternalFaces())
 {
-    surfaceScalarField phiMask
-    (
-        localMin<scalar>(mesh).interpolate(cellMask + interpolatedCells)
-    );
+    surfaceScalarField phiMask(localMin<scalar>(mesh).interpolate(cellMask));
 
     scalarField sumPhi(fvc::surfaceSum(mag(phiMask*phi))().internalField());
 

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/UEqn.H

@@ -1,4 +1,5 @@
 // Solve the Momentum equation
+
 MRF.correctBoundaryVelocity(U);
 
 tmp<fvVectorMatrix> tUEqn

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/createControls.H

@@ -0,0 +1,26 @@
+#include "createTimeControls.H"
+
+bool correctPhi
+(
+    pimple.dict().getOrDefault("correctPhi", false)
+);
+
+bool checkMeshCourantNo
+(
+    pimple.dict().getOrDefault("checkMeshCourantNo", false)
+);
+
+bool massFluxInterpolation
+(
+    pimple.dict().getOrDefault("massFluxInterpolation", false)
+);
+
+bool adjustFringe
+(
+    pimple.dict().getOrDefault("oversetAdjustPhi", false)
+);
+
+bool ddtCorr
+(
+    pimple.dict().getOrDefault("ddtCorr", true)
+);

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/interpolatedFaces.H

@@ -0,0 +1,273 @@
+// Interpolation used
+interpolationCellPoint<vector> UInterpolator(HbyA);
+
+// Determine faces on outside of interpolated cells
+bitSet isOwnerInterpolatedFace(mesh.nInternalFaces());
+bitSet isNeiInterpolatedFace(mesh.nInternalFaces());
+
+// Determine donor cells
+labelListList donorCell(mesh.nInternalFaces());
+
+scalarListList weightCellCells(mesh.nInternalFaces());
+
+// Interpolated HbyA faces
+vectorField UIntFaces(mesh.nInternalFaces(), Zero);
+
+// Determine receptor neighbour cells
+labelList receptorNeigCell(mesh.nInternalFaces(), -1);
+
+{
+    const cellCellStencilObject& overlap = Stencil::New(mesh);
+    const labelList& cellTypes = overlap.cellTypes();
+    const labelIOList& zoneID = overlap.zoneID();
+
+    label nZones = gMax(zoneID)+1;
+    PtrList<fvMeshSubset> meshParts(nZones);
+    labelList nCellsPerZone(nZones, Zero);
+
+    // A mesh subset for each zone
+    forAll(meshParts, zonei)
+    {
+        meshParts.set
+        (
+            zonei,
+            // Select cells where the zoneID == zonei
+            new fvMeshSubset(mesh, zonei, zoneID)
+        );
+    }
+
+    for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+    {
+        label ownType = cellTypes[mesh.faceOwner()[faceI]];
+        label neiType = cellTypes[mesh.faceNeighbour()[faceI]];
+        if
+        (
+            ownType == cellCellStencil::INTERPOLATED
+            && neiType == cellCellStencil::CALCULATED
+        )
+        {
+            isOwnerInterpolatedFace.set(faceI);
+
+            const vector& fc = mesh.faceCentres()[faceI];
+
+            for (label zoneI = 0; zoneI < nZones; zoneI++)
+            {
+                if (zoneI != zoneID[mesh.faceOwner()[faceI]])
+                {
+                    const fvMesh& partMesh = meshParts[zoneI].subMesh();
+                    const labelList& cellMap = meshParts[zoneI].cellMap();
+                    label cellI = partMesh.findCell(fc);
+
+                    if (cellI != -1)
+                    {
+                         // Determine weights
+                        labelList stencil(partMesh.cellCells()[cellI]);
+
+                        stencil.append(cellI);
+
+                        label st = stencil.size();
+
+                        donorCell[faceI].setSize(st);
+
+                        weightCellCells[faceI].setSize(st);
+
+                        scalarField weights(st);
+
+                        forAll(stencil, i)
+                        {
+                            scalar d = mag
+                            (
+                                partMesh.cellCentres()[stencil[i]]
+                              - fc
+                            );
+                            weights[i] = 1.0/d;
+                            donorCell[faceI][i] = cellMap[stencil[i]];
+                        }
+                        weights /= sum(weights);
+
+                        weightCellCells[faceI] = weights;
+
+                        forAll(stencil, i)
+                        {
+                            UIntFaces[faceI] +=
+                                weightCellCells[faceI][i]
+                               *UInterpolator.interpolate
+                                (
+                                    fc,
+                                    donorCell[faceI][i]
+                                );
+                        }
+
+                        break;
+                    }
+                }
+            }
+
+            receptorNeigCell[faceI] = mesh.faceNeighbour()[faceI];
+        }
+        else if
+        (
+            ownType == cellCellStencil::CALCULATED
+            && neiType == cellCellStencil::INTERPOLATED
+        )
+        {
+            isNeiInterpolatedFace.set(faceI);
+
+            const vector& fc = mesh.faceCentres()[faceI];
+            for (label zoneI = 0; zoneI < nZones; zoneI++)
+            {
+                if (zoneI != zoneID[mesh.faceNeighbour()[faceI]])
+                {
+                    const fvMesh& partMesh = meshParts[zoneI].subMesh();
+                    const labelList& cellMap = meshParts[zoneI].cellMap();
+                    label cellI = partMesh.findCell(fc);
+
+                    if (cellI != -1)
+                    {
+                        // Determine weights
+                        labelList stencil(partMesh.cellCells()[cellI]);
+
+                        stencil.append(cellI);
+
+                        label st = stencil.size();
+
+                        donorCell[faceI].setSize(st);
+
+                        weightCellCells[faceI].setSize(st);
+
+                        scalarField weights(st);
+
+                        forAll(stencil, i)
+                        {
+                            scalar d = mag
+                            (
+                                partMesh.cellCentres()[stencil[i]]
+                              - fc
+                            );
+                            weights[i] = 1.0/d;
+                            donorCell[faceI][i] = cellMap[stencil[i]];
+                        }
+                        weights /= sum(weights);
+
+                        weightCellCells[faceI] = weights;
+
+                        forAll(stencil, i)
+                        {
+                            UIntFaces[faceI] +=
+                                weightCellCells[faceI][i]
+                               *UInterpolator.interpolate
+                                (
+                                    fc,
+                                    donorCell[faceI][i]
+                                );
+                        }
+
+                        break;
+                    }
+                }
+            }
+
+            receptorNeigCell[faceI] = mesh.faceOwner()[faceI];
+        }
+    }
+}
+
+// contravariant U
+vectorField U1Contrav(mesh.nInternalFaces(), Zero);
+
+surfaceVectorField faceNormals(mesh.Sf()/mesh.magSf());
+
+forAll(isNeiInterpolatedFace, faceI)
+{
+    label cellId = -1;
+    if (isNeiInterpolatedFace.test(faceI))
+    {
+        cellId = mesh.faceNeighbour()[faceI];
+    }
+    else if (isOwnerInterpolatedFace.test(faceI))
+    {
+        cellId = mesh.faceOwner()[faceI];
+    }
+
+    if (cellId != -1)
+    {
+        const vector& n = faceNormals[faceI];
+        vector n1(Zero);
+
+        // 2-D cases
+        if (mesh.nSolutionD() == 2)
+        {
+            for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
+            {
+                if (mesh.geometricD()[cmpt] == -1)
+                {
+                    switch (cmpt)
+                    {
+                        case vector::X:
+                        {
+                            n1 = vector(0, n.z(), -n.y());
+                            break;
+                        }
+
+                        case vector::Y:
+                        {
+                            n1 = vector(n.z(), 0, -n.x());
+                            break;
+                        }
+
+                        case vector::Z:
+                        {
+                            n1 = vector(n.y(), -n.x(), 0);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        else if (mesh.nSolutionD() == 3)
+        {
+            //Determine which is the primary direction
+            if (mag(n.x()) > mag(n.y()) && mag(n.x()) > mag(n.z()))
+            {
+                n1 = vector(n.y(), -n.x(), 0);
+            }
+            else if (mag(n.y()) > mag(n.z()))
+            {
+                n1 = vector(0, n.z(), -n.y());
+            }
+            else
+            {
+                n1 = vector(-n.z(), 0, n.x());
+            }
+        }
+        n1.normalise();
+
+        const vector n2 = normalised(n ^ n1);
+
+        tensor rot =
+            tensor
+            (
+               n.x() ,n.y(), n.z(),
+               n1.x() ,n1.y(), n1.z(),
+               n2.x() ,n2.y(), n2.z()
+            );
+
+//         tensor rot =
+//             tensor
+//             (
+//                n  & x ,n  & y, n  & z,
+//                n1 & x ,n1 & y, n1 & z,
+//                n2 & x ,n2 & y, n2 & z
+//             );
+
+        U1Contrav[faceI].x() =
+           2*transform(rot, UIntFaces[faceI]).x()
+           - transform(rot, HbyA[receptorNeigCell[faceI]]).x();
+
+        U1Contrav[faceI].y() = transform(rot, HbyA[cellId]).y();
+
+        U1Contrav[faceI].z() = transform(rot, HbyA[cellId]).z();
+
+        HbyA[cellId] = transform(inv(rot), U1Contrav[faceI]);
+    }
+}

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/overPimpleDyMFoam.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,9 +46,12 @@ Description
 #include "fvOptions.H"
 
 #include "cellCellStencilObject.H"
+#include "zeroGradientFvPatchFields.H"
 #include "localMin.H"
+#include "interpolationCellPoint.H"
+#include "transform.H"
+#include "fvMeshSubset.H"
 #include "oversetAdjustPhi.H"
-#include "oversetPatchPhiErr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,9 +68,10 @@ int main(int argc, char *argv[])
     #include "setRootCaseLists.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "createDyMControls.H"
     #include "initContinuityErrs.H"
 
+    pimpleControl pimple(mesh);
+
     #include "createFields.H"
     #include "createUf.H"
     #include "createMRF.H"
@@ -84,9 +88,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readDyMControls.H"
-        #include "readOversetDyMControls.H"
-
+        #include "readControls.H"
         #include "CourantNo.H"
 
         #include "setDeltaT.H"
@@ -95,20 +97,45 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        mesh.update();
+        bool changed = mesh.update();
 
-        if (mesh.changing())
+        if (changed)
         {
             #include "setCellMask.H"
             #include "setInterpolatedCells.H"
-            #include "correctPhiFaceMask.H"
 
-            fvc::makeRelative(phi, U);
+            surfaceScalarField faceMaskOld
+            (
+                localMin<scalar>(mesh).interpolate(cellMask.oldTime())
+            );
 
-            if (checkMeshCourantNo)
-            {
-                #include "meshCourantNo.H"
-            }
+            // Zero Uf on old faceMask (H-I)
+            Uf *= faceMaskOld;
+            // Update Uf and phi on new C-I faces
+            Uf += (1-faceMaskOld)*fvc::interpolate(U);
+            phi = mesh.Sf() & Uf;
+
+            // Zero phi on current H-I
+            surfaceScalarField faceMask
+            (
+                localMin<scalar>(mesh).interpolate(cellMask)
+            );
+            phi *= faceMask;
+        }
+
+
+        if (mesh.changing() && correctPhi)
+        {
+            // Calculate absolute flux from the mapped surface velocity
+            #include "correctPhi.H"
+        }
+
+        // Make the flux relative to the mesh motion
+        fvc::makeRelative(phi, U);
+
+        if (mesh.changing() && checkMeshCourantNo)
+        {
+            #include "meshCourantNo.H"
         }
 
         // --- Pressure-velocity PIMPLE corrector loop

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/pEqn.H

@@ -1,11 +1,36 @@
+// Option 1: interpolate rAU, do not block out rAU on blocked cells
 volScalarField rAU("rAU", 1.0/UEqn.A());
+mesh.interpolate(rAU);
 
+// Option 2: do not interpolate rAU but block out rAU
+//surfaceScalarField rAUf("rAUf", fvc::interpolate(blockedCells*rAU));
+
+
+// Option 3: do not interpolate rAU but zero out rAUf on faces on holes
+// But what about:
+//
+//   H
+// H I C C C C
+//   H
+//
 surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
 volVectorField H("H", UEqn.H());
 
 volVectorField HbyA("HbyA", U);
 HbyA = constrainHbyA(rAU*H, U, p);
 
+if (massFluxInterpolation)
+{
+    #include "interpolatedFaces.H"
+}
+
+if (runTime.outputTime())
+{
+    H.write();
+    rAU.write();
+    HbyA.write();
+}
+
 if (pimple.nCorrPISO() <= 1)
 {
     tUEqn.clear();
@@ -13,16 +38,33 @@ if (pimple.nCorrPISO() <= 1)
 
 phiHbyA = fvc::flux(HbyA);
 
+if (ddtCorr)
+{
+    surfaceScalarField faceMaskOld
+    (
+        localMin<scalar>(mesh).interpolate(cellMask.oldTime())
+    );
+    phiHbyA += rAUf*faceMaskOld*fvc::ddtCorr(U, Uf);
+}
+
 MRF.makeRelative(phiHbyA);
 
+// WIP
+if (p.needReference())
+{
+    fvc::makeRelative(phiHbyA, U);
+    adjustPhi(phiHbyA, U, p);
+    fvc::makeAbsolute(phiHbyA, U);
+}
+
+
 if (adjustFringe)
 {
     fvc::makeRelative(phiHbyA, U);
-    oversetAdjustPhi(phiHbyA, U, zoneIdMass);
+    oversetAdjustPhi(phiHbyA, U);
     fvc::makeAbsolute(phiHbyA, U);
 }
 
-
 while (pimple.correctNonOrthogonal())
 {
     fvScalarMatrix pEqn
@@ -37,26 +79,27 @@ while (pimple.correctNonOrthogonal())
     if (pimple.finalNonOrthogonalIter())
     {
         phi = phiHbyA - pEqn.flux();
-        pEqn.relax();
-        U =
-            cellMask*
-            (
-                HbyA
-              - rAU*fvc::reconstruct((pEqn.flux())/rAUf)
-            );
-        U.correctBoundaryConditions();
-        fvOptions.correct(U);
-    }
-
-    if (oversetPatchErrOutput)
-    {
-        oversetPatchPhiErr(pEqn, phiHbyA);
+        // option 2:
+        // rAUf*fvc::snGrad(p)*mesh.magSf();
     }
 }
 
-// Excludes error in interpolated/hole cells
+
 #include "continuityErrs.H"
 
+// Explicitly relax pressure for momentum corrector
+p.relax();
+volVectorField gradP(fvc::grad(p));
+
+// Option 2: zero out velocity on blocked out cells
+//U = HbyA - rAU*cellMask*gradP;
+// Option 3: zero out velocity on blocked out cells
+// This is needed for the scalar Eq (k,epsilon, etc)
+// which can use U as source term
+U = cellMask*(HbyA - rAU*gradP);
+U.correctBoundaryConditions();
+
+fvOptions.correct(U);
 
 {
     Uf = fvc::interpolate(U);
@@ -66,4 +109,9 @@ while (pimple.correctNonOrthogonal())
 
 // Make the fluxes relative to the mesh motion
 fvc::makeRelative(phi, U);
+
+surfaceScalarField faceMask
+(
+    localMin<scalar>(mesh).interpolate(cellMask)
+);
 phi *= faceMask;

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/readControls.H

@@ -0,0 +1,10 @@
+#include "readTimeControls.H"
+
+correctPhi = pimple.dict().getOrDefault("correctPhi", false);
+
+checkMeshCourantNo = pimple.dict().getOrDefault("checkMeshCourantNo", false);
+
+massFluxInterpolation =
+    pimple.dict().getOrDefault("massFluxInterpolation", false);
+
+ddtCorr = pimple.dict().getOrDefault("ddtCorr", true);

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

@@ -24,3 +24,7 @@ bool adjustFringe
 (
     simple.dict().getOrDefault("oversetAdjustPhi", false)
 );
+bool massFluxInterpolation
+(
+    simple.dict().getOrDefault("massFluxInterpolation", false)
+);

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

@@ -1,10 +1,18 @@
 {
+    surfaceScalarField faceMask(localMin<scalar>(mesh).interpolate(cellMask));
+
     volScalarField rAU(1.0/UEqn.A());
     surfaceScalarField rAUf("rAUf", faceMask*fvc::interpolate(rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = constrainHbyA(cellMask*rAU*UEqn.H(), U, p);
 
+    //mesh.interpolate(HbyA);
+    if (massFluxInterpolation)
+    {
+        #include "interpolatedFaces.H"
+    }
+
     tUEqn.clear();
 
     surfaceScalarField phiHbyA("phiHbyA", fvc::flux(HbyA));

applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/createFields.H

@@ -129,5 +129,10 @@ compressibleInterPhaseTransportModel turbulence
 // Mask field for zeroing out contributions on hole cells
 #include "createCellMask.H"
 
+surfaceScalarField faceMask
+(
+    localMin<scalar>(mesh).interpolate(cellMask)
+);
+
 // Create bool field with interpolated cells
 #include "createInterpolatedCells.H"

applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/overCompressibleInterDyMFoam.C

@@ -80,6 +80,9 @@ int main(int argc, char *argv[])
     #include "setRootCaseLists.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
+    pimpleControl pimple(mesh);
+
+    #include "createTimeControls.H"
     #include "createDyMControls.H"
     #include "createFields.H"
 
@@ -106,7 +109,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readDyMControls.H"
+        #include "readControls.H"
 
         if (LTS)
         {
@@ -151,10 +154,40 @@ int main(int argc, char *argv[])
                     // Update cellMask field for blocking out hole cells
                     #include "setCellMask.H"
                     #include "setInterpolatedCells.H"
-                    #include "correctPhiFaceMask.H"
+
+                    faceMask =
+                        localMin<scalar>(mesh).interpolate(cellMask.oldTime());
+
+                    // Zero Uf on old faceMask (H-I)
+                    Uf *= faceMask;
+
+                    const surfaceVectorField Uint(fvc::interpolate(U));
+                    // Update Uf and phi on new C-I faces
+                    Uf += (1-faceMask)*Uint;
+
+                    // Update Uf boundary
+                    forAll(Uf.boundaryField(), patchI)
+                    {
+                        Uf.boundaryFieldRef()[patchI] =
+                            Uint.boundaryField()[patchI];
+                    }
+
+                    phi = mesh.Sf() & Uf;
+
+                    // Correct phi on individual regions
+                    if (correctPhi)
+                    {
+                         #include "correctPhi.H"
+                    }
 
                     mixture.correct();
 
+                    // Zero phi on current H-I
+                    faceMask = localMin<scalar>(mesh).interpolate(cellMask);
+
+                    phi *= faceMask;
+                    U *= cellMask;
+
                     // Make the flux relative to the mesh motion
                     fvc::makeRelative(phi, U);
 
@@ -169,6 +202,10 @@ int main(int argc, char *argv[])
             #include "alphaControls.H"
             #include "compressibleAlphaEqnSubCycle.H"
 
+            const surfaceScalarField faceMask
+            (
+                localMin<scalar>(mesh).interpolate(cellMask)
+            );
             rhoPhi *= faceMask;
 
             turbulence.correctPhasePhi();

applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/pEqn.H

@@ -10,6 +10,19 @@
         fvc::flux(HbyA)
     );
 
+    if (ddtCorr)
+    {
+        surfaceScalarField faceMaskOld
+        (
+            localMin<scalar>(mesh).interpolate(cellMask.oldTime())
+        );
+        phiHbyA +=
+            MRF.zeroFilter
+            (
+                fvc::interpolate(rho*rAU)*faceMaskOld*fvc::ddtCorr(U, Uf)
+            );
+    }
+
     MRF.makeRelative(phiHbyA);
 
     surfaceScalarField phig

applications/solvers/multiphase/interFoam/overInterDyMFoam/CourantNo.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2011 OpenFOAM Foundation
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,10 +36,7 @@ scalar meanCoNum = 0.0;
 
 if (mesh.nInternalFaces())
 {
-    surfaceScalarField phiMask
-    (
-        localMin<scalar>(mesh).interpolate(cellMask + interpolatedCells)
-    );
+    surfaceScalarField phiMask(localMin<scalar>(mesh).interpolate(cellMask));
 
     scalarField sumPhi
     (

applications/solvers/multiphase/interFoam/overInterDyMFoam/alphaSuSp.H

@@ -7,5 +7,3 @@ volScalarField::Internal divU
   ? fvc::div(phiCN() + mesh.phi())
   : fvc::div(phiCN())
 );
-
-divU *= interpolatedCells*cellMask;

applications/solvers/multiphase/interFoam/overInterDyMFoam/createDyMControls.H

@@ -0,0 +1,30 @@
+bool correctPhi
+(
+    pimple.dict().getOrDefault("correctPhi", true)
+);
+
+bool checkMeshCourantNo
+(
+    pimple.dict().getOrDefault("checkMeshCourantNo", false)
+);
+
+bool moveMeshOuterCorrectors
+(
+    pimple.dict().getOrDefault("moveMeshOuterCorrectors", false)
+);
+
+
+bool massFluxInterpolation
+(
+    pimple.dict().getOrDefault("massFluxInterpolation", false)
+);
+
+bool adjustFringe
+(
+    pimple.dict().getOrDefault("oversetAdjustPhi", false)
+);
+
+bool ddtCorr
+(
+    pimple.dict().getOrDefault("ddtCorr", true)
+);

applications/solvers/multiphase/interFoam/overInterDyMFoam/createFields.H

@@ -40,12 +40,8 @@ volVectorField U
     nonInt.insert("HbyA");
     nonInt.insert("grad(p_rgh)");
     nonInt.insert("nHat");
-    nonInt.insert("surfaceIntegrate(nHatf)");
-    nonInt.insert("surfaceIntegrate(phi+meshPhi)");
     nonInt.insert("surfaceIntegrate(phi)");
     nonInt.insert("surfaceIntegrate(phiHbyA)");
-    nonInt.insert("surfaceSum(((S|magSf)*S)");
-    nonInt.insert("surfaceIntegrate(((rAUf*magSf)*snGradCorr(p_rgh)))");
     nonInt.insert("cellMask");
     nonInt.insert("cellDisplacement");
     nonInt.insert("interpolatedCells");

applications/solvers/multiphase/interFoam/overInterDyMFoam/overInterDyMFoam.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2014 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,11 +49,14 @@ Description
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
+#include "CorrectPhi.H"
 #include "fvcSmooth.H"
 #include "cellCellStencilObject.H"
 #include "localMin.H"
+#include "interpolationCellPoint.H"
+#include "transform.H"
+#include "fvMeshSubset.H"
 #include "oversetAdjustPhi.H"
-#include "oversetPatchPhiErr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -73,7 +76,8 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-
+    pimpleControl pimple(mesh);
+    #include "createTimeControls.H"
     #include "createDyMControls.H"
     #include "createFields.H"
     #include "createAlphaFluxes.H"
@@ -93,8 +97,11 @@ int main(int argc, char *argv[])
         dimensionedScalar("rAUf", dimTime/rho.dimensions(), 1.0)
     );
 
+    if (correctPhi)
+    {
+        #include "correctPhi.H"
+    }
     #include "createUf.H"
-    #include "createControls.H"
 
     #include "setCellMask.H"
     #include "setInterpolatedCells.H"
@@ -112,8 +119,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readDyMControls.H"
-        #include "readOversetDyMControls.H"
+        #include "readControls.H"
 
         if (LTS)
         {
@@ -152,17 +158,50 @@ int main(int argc, char *argv[])
                         talphaPhi1Corr0.clear();
                     }
 
-                    // Update cellMask field for blocking out hole cells
-                    #include "setCellMask.H"
-                    #include "setInterpolatedCells.H"
-                    #include "correctPhiFaceMask.H"
-
                     gh = (g & mesh.C()) - ghRef;
                     ghf = (g & mesh.Cf()) - ghRef;
 
+                    // Update cellMask field for blocking out hole cells
+                    #include "setCellMask.H"
+                    #include "setInterpolatedCells.H"
+
+                    const surfaceScalarField faceMaskOld
+                    (
+                        localMin<scalar>(mesh).interpolate(cellMask.oldTime())
+                    );
+
+                    // Zero Uf on old faceMask (H-I)
+                    Uf *= faceMaskOld;
+
+                    const surfaceVectorField Uint(fvc::interpolate(U));
+                    // Update Uf and phi on new C-I faces
+                    Uf += (1-faceMaskOld)*Uint;
+
+                    // Update Uf boundary
+                    forAll(Uf.boundaryField(), patchI)
+                    {
+                        Uf.boundaryFieldRef()[patchI] =
+                            Uint.boundaryField()[patchI];
+                    }
+
+                    phi = mesh.Sf() & Uf;
+
+                    // Correct phi on individual regions
+                    if (correctPhi)
+                    {
+                         #include "correctPhi.H"
+                    }
 
                     mixture.correct();
 
+                    // Zero phi on current H-I
+                    const surfaceScalarField faceMask
+                    (
+                        localMin<scalar>(mesh).interpolate(cellMask)
+                    );
+                    phi *= faceMask;
+                    U   *= cellMask;
+
                     // Make the flux relative to the mesh motion
                     fvc::makeRelative(phi, U);
 
@@ -174,14 +213,14 @@ int main(int argc, char *argv[])
                 }
             }
 
-            if (adjustFringe)
-            {
-                oversetAdjustPhi(phi, U, zoneIdMass);
-            }
 
             #include "alphaControls.H"
             #include "alphaEqnSubCycle.H"
 
+            const surfaceScalarField faceMask
+            (
+                localMin<scalar>(mesh).interpolate(cellMask)
+            );
             rhoPhi *= faceMask;
 
             mixture.correct();

applications/solvers/multiphase/interFoam/overInterDyMFoam/pEqn.H

@@ -1,31 +1,64 @@
 {
     rAU = 1.0/UEqn.A();
+    //mesh.interpolate(rAU);
+
+    surfaceScalarField faceMask(localMin<scalar>(mesh).interpolate(cellMask));
 
     surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
 
     volVectorField H("H", UEqn.H());
 
     volVectorField HbyA("HbyA", U);
-
+    //HbyA = rAU*UEqn.H();
     HbyA = constrainHbyA(rAU*H, U, p_rgh);
 
+    if (massFluxInterpolation)
+    {
+        #include "interpolatedFaces.H"
+    }
+
     surfaceScalarField phiHbyA("phiHbyA", fvc::flux(HbyA));
 
+    if (ddtCorr)
+    {
+        surfaceScalarField faceMaskOld
+        (
+            localMin<scalar>(mesh).interpolate(cellMask.oldTime())
+        );
+        phiHbyA +=
+            fvc::interpolate(rho*rAU)*faceMaskOld*fvc::ddtCorr(U, Uf);
+    }
     MRF.makeRelative(phiHbyA);
 
+    if (p_rgh.needReference())
+    {
+        fvc::makeRelative(phiHbyA, U);
+        adjustPhi(phiHbyA, U, p_rgh);
+        fvc::makeAbsolute(phiHbyA, U);
+    }
+
+    if (adjustFringe)
+    {
+        fvc::makeRelative(phiHbyA, U);
+        oversetAdjustPhi(phiHbyA, U);
+        fvc::makeAbsolute(phiHbyA, U);
+    }
+
     surfaceScalarField phig
     (
         (
             mixture.surfaceTensionForce()
-          - ghf*fvc::snGrad(cellMask*rho)
-        )*rAUf*faceMask*mesh.magSf()
+          - ghf*fvc::snGrad(rho)
+        )*faceMask*rAUf*mesh.magSf()
     );
 
     phiHbyA += phig;
 
     if (adjustFringe)
     {
-        oversetAdjustPhi(phiHbyA, U, zoneIdMass);
+        fvc::makeRelative(phiHbyA, U);
+        oversetAdjustPhi(phiHbyA, U);
+        fvc::makeAbsolute(phiHbyA, U);
     }
 
     // Update the pressure BCs to ensure flux consistency
@@ -57,10 +90,6 @@
             U.correctBoundaryConditions();
             fvOptions.correct(U);
         }
-        if (oversetPatchErrOutput)
-        {
-            oversetPatchPhiErr(p_rghEqn, phiHbyA);
-        }
     }
 
     #include "continuityErrs.H"

applications/solvers/multiphase/interFoam/overInterDyMFoam/readControls.H

@@ -0,0 +1,16 @@
+#include "readTimeControls.H"
+
+correctPhi = pimple.dict().getOrDefault("correctPhi", false);
+
+checkMeshCourantNo =
+    pimple.dict().getOrDefault("checkMeshCourantNo", false);
+
+moveMeshOuterCorrectors =
+    pimple.dict().getOrDefault("moveMeshOuterCorrectors", false);
+
+massFluxInterpolation =
+    pimple.dict().getOrDefault("massFluxInterpolation", false);
+
+ddtCorr = pimple.dict().getOrDefault("ddtCorr", true);
+
+adjustFringe =  pimple.dict().getOrDefault("oversetAdjustPhi", false);

applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/correctPhi.H

@@ -0,0 +1,11 @@
+CorrectPhi
+(
+    U,
+    phi,
+    p_rgh,
+    surfaceScalarField("rAUf", fvc::interpolate(rAU)),
+    divU,
+    pimple
+);
+
+#include "continuityErrs.H"

applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/createFields.H

@@ -149,5 +149,10 @@ surfaceScalarField alphaPhi10
 // Mask field for zeroing out contributions on hole cells
 #include "createCellMask.H"
 
+surfaceScalarField faceMask
+(
+    localMin<scalar>(mesh).interpolate(cellMask)
+);
+
 // Create bool field with interpolated cells
 #include "createInterpolatedCells.H"

applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/overInterPhaseChangeDyMFoam.C

@@ -82,7 +82,9 @@ int main(int argc, char *argv[])
     #include "setRootCaseLists.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
+    pimpleControl pimple(mesh);
 
+    #include "createTimeControls.H"
     #include "createDyMControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
@@ -116,7 +118,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readDyMControls.H"
+        #include "readControls.H"
 
         // Store divU from the previous mesh so that it can be mapped
         // and used in correctPhi to ensure the corrected phi has the
@@ -151,10 +153,40 @@ int main(int argc, char *argv[])
                      // Update cellMask field for blocking out hole cells
                     #include "setCellMask.H"
                     #include "setInterpolatedCells.H"
-                    #include "correctPhiFaceMask.H"
+
+                    faceMask =
+                        localMin<scalar>(mesh).interpolate(cellMask.oldTime());
+
+
+                    // Zero Uf on old faceMask (H-I)
+                    Uf *= faceMask;
+
+                    const surfaceVectorField Uint(fvc::interpolate(U));
+                    // Update Uf and phi on new C-I faces
+                    Uf += (1-faceMask)*Uint;
+
+                    // Update Uf boundary
+                    forAll(Uf.boundaryField(), patchI)
+                    {
+                        Uf.boundaryFieldRef()[patchI] =
+                            Uint.boundaryField()[patchI];
+                    }
+
+                    phi = mesh.Sf() & Uf;
+
+                    if (correctPhi)
+                    {
+                        #include "correctPhi.H"
+                    }
 
                     mixture->correct();
 
+                    // Zero phi on current H-I
+                    faceMask = localMin<scalar>(mesh).interpolate(cellMask);
+
+                    phi *= faceMask;
+                    U   *= cellMask;
+
                     // Make the flux relative to the mesh motion
                     fvc::makeRelative(phi, U);
                 }
@@ -182,6 +214,10 @@ int main(int argc, char *argv[])
             mixture->correct();
 
             #include "alphaEqnSubCycle.H"
+            const surfaceScalarField faceMask
+            (
+                localMin<scalar>(mesh).interpolate(cellMask)
+            );
             rhoPhi *= faceMask;
 
             interface.correct();

applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/pEqn.H

@@ -8,6 +8,16 @@
         fvc::flux(HbyA)
     );
 
+
+    if (ddtCorr)
+    {
+        surfaceScalarField faceMaskOld
+        (
+            localMin<scalar>(mesh).interpolate(cellMask.oldTime())
+        );
+        phiHbyA += faceMaskOld*fvc::ddtCorr(U, Uf);
+    }
+
     if (p_rgh.needReference())
     {
         fvc::makeRelative(phiHbyA, U);

applications/test/00-dummy/Allwmake

@@ -7,7 +7,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 
 library/Allwmake
 
-# Does not use libOpenFOAM or libPstream...
-wmake -no-openfoam
+wmake
 
 #------------------------------------------------------------------------------

applications/test/00-dummy/Make/files

@@ -1,4 +1,4 @@
 /* Install into FOAM_APPBIN to support 'fake' builds (to test packaging) */
-Test-dummyLib.cpp
+Test-dummyLib.C
 
 EXE = $(FOAM_APPBIN)/Test-dummyLib

applications/test/00-dummy/library/Make/files

@@ -1,4 +1,4 @@
 /* Install into central FOAM_LIBBIN for 'fake' builds (test packaging) */
-dummyLib.cpp
+dummyLib.C
 
 LIB = $(FOAM_LIBBIN)/libTestDummy-OpenFOAM

applications/test/00-dummy/library/dummy/Make/files

@@ -1,4 +1,4 @@
 /* Install into central FOAM_LIBBIN/dummy for 'fake' builds (test packaging) */
-dummyMpiLib.cpp
+dummyMpiLib.C
 
 LIB = $(FOAM_LIBBIN)/dummy/libTestDummyMpi

applications/test/00-dummy/library/mpi/Make/files

@@ -1,4 +1,4 @@
 /* Install into central FOAM_MPI_LIBBIN for 'fake' builds (test packaging) */
-dummyMpiLib.cpp
+dummyMpiLib.C
 
 LIB = $(FOAM_MPI_LIBBIN)/libTestDummyMpi

applications/test/00-machine-sizes/Test-machine-sizes.cpp

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,8 +59,7 @@ void print(const char* name, bool showLimits = true)
 
 int main(int argc, char *argv[])
 {
-    std::cout<< "c++ = " << __cplusplus << '\n';
-    std::cout<< "machine sizes\n---\n\n";
+    std::cout<<"machine sizes\n---\n\n";
 
     print<short>("short");
     print<int>("int");

applications/test/00-openmp/Allwmake

@@ -1,8 +0,0 @@
-#!/bin/sh
-cd "${0%/*}" || exit                                # Run from this directory
-#------------------------------------------------------------------------------
-
-# Does not use libOpenFOAM or libPstream...
-wmake -no-openfoam
-
-#------------------------------------------------------------------------------

applications/test/CircularBuffer/Test-CircularBuffer.C

@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
 
     while (buf1.size() > 2)
     {
-        buf1.pop_front();
+        (void) buf1.pop_front();
     }
     report(buf1);
 
@@ -123,8 +123,6 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    Info<< nl << "list: " << flatOutput(buf2.list()) << nl;
-
     Info<< "normal: " << flatOutput(buf2) << nl;
     buf2.reverse();
     Info<< "reverse: " << flatOutput(buf2) << nl;

applications/test/DLList/Test-DLList.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -152,15 +152,15 @@ int main(int argc, char *argv[])
     Info<< " => " << flatOutput(myList) << nl;
 
     {
-        myList.swapUp(myList.DLListBase::front());
-        myList.swapUp(myList.DLListBase::back());
+        myList.swapUp(myList.DLListBase::first());
+        myList.swapUp(myList.DLListBase::last());
 
         Info<< nl << "swapUp => " << flatOutput(myList) << nl;
     }
 
     {
-        myList.swapDown(myList.DLListBase::front());
-        myList.swapDown(myList.DLListBase::back());
+        myList.swapDown(myList.DLListBase::first());
+        myList.swapDown(myList.DLListBase::last());
 
         Info<< nl << "swapDown => " << flatOutput(myList) << nl;
     }

applications/test/FixedList/Test-FixedList.C

@@ -189,12 +189,6 @@ int main(int argc, char *argv[])
             << " hash:" << FixedList<label, 4>::hasher()(list1) << nl
             << " hash:" << Hash<FixedList<label, 4>>()(list1) << nl;
 
-        Info<< "get<0>: " << list1.get<0>() << nl;
-        Info<< "get<1>: " << list1.get<1>() << nl;
-        Info<< "get<2>: " << list1.get<2>() << nl;
-        Info<< "get<3>: " << list1.get<3>() << nl;
-// Will not compile:  Info<< "get<4>: " << list1.get<4>() << nl;
-
         label a[4] = {0, 1, 2, 3};
         FixedList<label, 4> list2(a);
 

applications/test/IOobjectList/Test-IOobjectList.C

@@ -240,8 +240,13 @@ int main(int argc, char *argv[])
     );
     argList::addBoolOption
     (
-        "merge",
-        "test merging lists (requires -filter)"
+        "copy-append",
+        "test move append lists (requires -filter)"
+    );
+    argList::addBoolOption
+    (
+        "move-append",
+        "test move append lists (requires -filter)"
     );
 
     // timeSelector::addOptions();
@@ -256,10 +261,16 @@ int main(int argc, char *argv[])
         Info<<"limit names: " << matcher << nl;
     }
 
-    if (args.found("merge") && matcher.empty())
+    if (args.found("copy-append") && matcher.empty())
     {
         FatalError
-            << nl << "The -merge test also requires -filter" << nl
+            << nl << "The -copy-append test also requires -filter" << nl
+            << exit(FatalError);
+    }
+    if (args.found("move-append") && matcher.empty())
+    {
+        FatalError
+            << nl << "The -move-append test also requires -filter" << nl
             << exit(FatalError);
     }
 
@@ -316,9 +327,13 @@ int main(int argc, char *argv[])
         // On last time
         if (timeI == timeDirs.size()-1)
         {
-            if (args.found("merge"))
+            if (args.found("copy-append"))
             {
-                Info<< nl << "Test merge" << nl;
+                Info<< nl << "Test move append" << nl;
+            }
+            else if (args.found("move-append"))
+            {
+                Info<< nl << "Test move append" << nl;
             }
             else
             {
@@ -334,8 +349,18 @@ int main(int argc, char *argv[])
             Info<< "==target==" << nl; reportDetail(objects);
             Info<< "==source==" << nl; reportDetail(other);
 
-            objects.merge(std::move(other));
-            Info<< nl << "After merge" << nl;
+            if (args.found("copy-append"))
+            {
+                objects.append(other);
+
+                Info<< nl << "After copy-append" << nl;
+            }
+            else
+            {
+                objects.append(std::move(other));
+
+                Info<< nl << "After move-append" << nl;
+            }
 
             Info<< "==target==" << nl; reportDetail(objects);
             Info<< "==source==" << nl; reportDetail(other);

applications/test/IndirectList/Test-IndirectList.C

@@ -101,9 +101,6 @@ int main(int argc, char *argv[])
 
     printInfo(idl1);
 
-    Info<< "list() = ";
-    idl1.list().writeList(Info, 0) << endl;
-
     for (const label val : { 10, 30, 40, 50, 90, 80, 120 } )
     {
         testFind(val, idl1);

applications/test/OFstream/Make/files

@@ -1,3 +0,0 @@
-Test-OFstream.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-OFstream

applications/test/OFstream/Make/options

@@ -1,2 +0,0 @@
-/* EXE_INC = */
-/* EXE_LIBS = */

applications/test/OFstream/Test-OFstream.C

@@ -1,228 +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/>.
-
-Description
-    Test OFstream. Primarily atomic operations
-
-\*---------------------------------------------------------------------------*/
-
-#include "Fstream.H"
-#include "IOstreams.H"
-#include "OSspecific.H"
-#include "argList.H"
-#include "ListOps.H"
-
-using namespace Foam;
-
-void listFiles(const fileName& dir)
-{
-    wordList files = ListOps::create<word>
-    (
-        readDir(dir, fileName::FILE),
-        nameOp<fileName>()
-    );
-
-    Info
-        << nl
-        << "files:" << nl
-        << files << nl
-        << "ls" << nl
-        << "============" << endl;
-    Foam::system("ls -al " + dir);
-    Info<< "============" << endl;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    argList::addBoolOption("gz", "Use compression");
-    argList::addBoolOption("append", "Use append mode");
-    argList::addBoolOption("atomic", "Use atomic");
-    argList::addBoolOption("keep", "Do not remove test directory");
-    argList::addOption("write", "file", "test writing to file");
-
-    #include "setRootCase.H"
-
-    const fileName baseDir("Test-OFstream-directory");
-
-    Foam::mkDir(baseDir);
-
-    InfoErr<< "mkdir: " << baseDir << endl;
-
-    IOstreamOption streamOpt;
-
-    if (args.found("gz"))
-    {
-        streamOpt.compression(IOstreamOption::COMPRESSED);
-    }
-
-    IOstreamOption::appendType append =
-    (
-        args.found("append")
-      ? IOstreamOption::APPEND
-      : IOstreamOption::NON_APPEND
-    );
-    IOstreamOption::atomicType atomic =
-    (
-        args.found("atomic")
-      ? IOstreamOption::ATOMIC
-      : IOstreamOption::NON_ATOMIC
-    );
-
-    {
-        OFstream(baseDir/"dummy")() << "Some file content" << endl;
-
-        Foam::ln("dummy", baseDir/"Test2.txt");
-        Foam::ln("dummy", baseDir/"Test3.txt");
-        Foam::ln("dummy", baseDir/"Test4.txt");
-        Foam::ln("dummy", baseDir/"Test4.txt.gz");
-        Foam::ln("dummy", baseDir/"Test5.txt");
-        Foam::ln("dummy", baseDir/"Test5.txt.gz");
-    }
-
-    {
-        OFstream os
-        (
-            atomic,
-            baseDir/"Test1.txt",
-            streamOpt,
-            append
-        );
-
-        os << "=========================" << endl;
-
-        InfoErr<< "open: " << os.name() << endl;
-        InfoErr<< "... sleep" << endl;
-
-        listFiles(baseDir);
-
-        sleep(2);
-
-        os << "+++++++++++++++++++++++++++++++++++" << endl;
-    }
-
-    {
-        OFstream os
-        (
-            atomic,
-            baseDir/"Test2.txt",
-            streamOpt
-            // NON_APPEND
-        );
-
-        os << "=========================" << endl;
-
-        InfoErr<< "open: " << os.name() << endl;
-        InfoErr<< "... sleep" << endl;
-
-        listFiles(baseDir);
-
-        sleep(2);
-
-        os << "+++++++++++++++++++++++++++++++++++" << endl;
-    }
-    {
-        OFstream os
-        (
-            atomic,
-            baseDir/"Test3.txt",
-            streamOpt,
-            IOstreamOption::APPEND
-        );
-
-        os << "=========================" << endl;
-
-        InfoErr<< "open: " << os.name() << endl;
-        InfoErr<< "... sleep" << endl;
-
-        listFiles(baseDir);
-
-        sleep(2);
-
-        os << "+++++++++++++++++++++++++++++++++++" << endl;
-    }
-    {
-        OFstream os
-        (
-            baseDir/"Test4.txt",
-            IOstreamOption::ASCII,
-            IOstreamOption::COMPRESSED
-        );
-
-        os << "=========================" << endl;
-
-        InfoErr<< "open: " << os.name() << endl;
-        InfoErr<< "... sleep" << endl;
-
-        listFiles(baseDir);
-
-        sleep(2);
-
-        os << "+++++++++++++++++++++++++++++++++++" << endl;
-    }
-    {
-        OFstream os
-        (
-            IOstreamOption::ATOMIC,
-            baseDir/"Test5.txt"
-            // ASCII UNCOMPRESSED NON_APPEND
-        );
-
-        os << "=========================" << endl;
-
-        InfoErr<< "open: " << os.name() << endl;
-        InfoErr<< "... sleep" << endl;
-
-        listFiles(baseDir);
-
-        sleep(2);
-
-        os << "+++++++++++++++++++++++++++++++++++" << endl;
-    }
-
-    Info<< nl << "done:" << endl;
-
-    listFiles(baseDir);
-
-    if (args.found("keep"))
-    {
-        InfoErr<< "keep: " << baseDir << endl;
-    }
-    else
-    {
-        InfoErr<< "rmdir: " << baseDir << endl;
-        Foam::rmDir(baseDir);
-    }
-
-    Info<< "\nEnd\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //

applications/test/PtrList/Test-PtrList.C

@@ -108,7 +108,7 @@ Ostream& printAddr
 
     for (label i=0; i < len; ++i)
     {
-        os << "addr=" << Foam::name(list.get(i)) << nl;
+        os << "addr=" << name(list(i)) << nl;
     }
 
     // End delimiter
@@ -140,7 +140,7 @@ Ostream& print
 
     for (label i=0; i < len; ++i)
     {
-        const T* ptr = list.get(i);
+        const T* ptr = list(i);
 
         if (ptr)
         {
@@ -174,7 +174,7 @@ Ostream& print
 
     for (label i=0; i < len; ++i)
     {
-        const T* ptr = list.get(i);
+        const T* ptr = list(i);
 
         if (ptr)
         {
@@ -192,7 +192,7 @@ Ostream& print
 
         for (label i=len; i < cap; ++i)
         {
-            const T* ptr = list.get(i);
+            const T* ptr = list(i);
 
             os << "unused " << name(ptr) << nl;
         }
@@ -274,9 +274,9 @@ int main(int argc, char *argv[])
 
     {
         DLPtrList<Scalar> llist1;
-        llist1.push_front(new Scalar(100));
-        llist1.push_front(new Scalar(200));
-        llist1.push_front(new Scalar(300));
+        llist1.prepend(new Scalar(100));
+        llist1.prepend(new Scalar(200));
+        llist1.prepend(new Scalar(300));
 
         auto citer = llist1.begin();
 
@@ -305,9 +305,9 @@ int main(int argc, char *argv[])
     // Same but as SLPtrList
     {
         SLPtrList<Scalar> llist1;
-        llist1.push_front(new Scalar(100));
-        llist1.push_front(new Scalar(200));
-        llist1.push_front(new Scalar(300));
+        llist1.prepend(new Scalar(100));
+        llist1.prepend(new Scalar(200));
+        llist1.prepend(new Scalar(300));
 
         for (const auto& it : llist1)
         {
@@ -334,7 +334,7 @@ int main(int argc, char *argv[])
     {
         listApp.append(new Scalar(1.3*i));
     }
-    listApp.emplace_back(100);
+    listApp.emplace_append(100);
 
 
     Info<< nl
@@ -580,8 +580,8 @@ int main(int argc, char *argv[])
     }
 
     PtrList<plane> planes;
-    planes.emplace_back(vector::one, vector::one);
-    planes.emplace_back(vector(1,2,3), vector::one);
+    planes.emplace_append(vector::one, vector::one);
+    planes.emplace_append(vector(1,2,3), vector::one);
 
     Info<< nl << "appended values" << nl;
     for (const plane& p : planes)
@@ -594,15 +594,15 @@ int main(int argc, char *argv[])
     PtrDynList<plane> dynPlanes;
 
     {
-        dynPlanes.emplace_back(vector::one, vector::one);
-        dynPlanes.emplace_back(vector(1,2,3), vector::one);
+        dynPlanes.emplace_append(vector::one, vector::one);
+        dynPlanes.emplace_append(vector(1,2,3), vector::one);
         dynPlanes.append(nullptr);
 
         dynPlanes.set(6, new plane(vector(2,2,1), vector::one));
         dynPlanes.set(10, new plane(vector(4,5,6), vector::one));
 
         dynPlanes.emplace(12, vector(3,2,1), vector::one);
-        dynPlanes.emplace_back(Zero, vector::one);
+        dynPlanes.emplace_append(Zero, vector::one);
     }
 
     Info<< nl << "PtrDynList: ";
@@ -633,7 +633,7 @@ int main(int argc, char *argv[])
 
         forAll(dynPlanes, i)
         {
-            const plane* pln = dynPlanes.get(i);
+            const plane* pln = dynPlanes.set(i);
             if (pln)
             {
                 stdPlanes.set(i, new plane(*pln));

applications/test/boolVector/Test-boolVector.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,7 +43,7 @@ void print(const boolVector& v)
         << " any:" << Switch::name(v.any())
         << " all:" << Switch::name(v.all())
         << " none:" << Switch::name(v.none())
-        << " on:" << v.count() << " off:" << v.count(false) << nl;
+        << " count:" << v.count() << nl;
 }
 
 
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
     Info<< nl;
 
     {
-        boolVector vec(1, 0, 1);
+        boolVector vec{1, 0, 1};
         print(vec);
 
         vec.flip();

applications/test/boundBox/Test-boundBox.C

@@ -34,6 +34,7 @@ Description
 #include "line.H"
 #include "Random.H"
 #include "treeBoundBox.H"
+#include "cellModel.H"
 #include "bitSet.H"
 #include "HashSet.H"
 #include "ListOps.H"
@@ -58,7 +59,8 @@ int main(int argc, char *argv[])
 {
     #include "setRootCase.H"
 
-    Info<<"boundBox faces: " << boundBox::hexFaces() << nl
+    Info<<"boundBox faces: " << boundBox::faces << nl
+        <<"hex faces: " << cellModel::ref(cellModel::HEX).modelFaces() << nl
         <<"tree-bb faces: " << treeBoundBox::faces << nl
         <<"tree-bb edges: " << treeBoundBox::edges << endl;
 
@@ -111,8 +113,10 @@ int main(int argc, char *argv[])
         Info<<"enclose point " << pt << " -> " << bb << endl;
 
         // restart with same points
-        bb.reset(point::zero);
-        bb.add(point(1,1,1), point(0,1.5,0.5));
+        bb = boundBox::invertedBox;
+        bb.add(point(1,1,1));
+        bb.add(point::zero);
+        bb.add(point(0,1.5,0.5));
         bb.add(point(5,2,-2));
 
         Info<<"repeated " << bb << endl;

applications/test/boundBox2/Make/files

@@ -1,3 +0,0 @@
-Test-boundBox2.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-boundBox2

applications/test/boundBox2/Make/options

@@ -1,2 +0,0 @@
-/* EXE_INC = */
-/* EXE_LIBS = */

applications/test/boundBox2/Test-boundBox2.C

@@ -1,235 +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/>.
-
-Description
-    Test bounding box behaviour
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "Time.H"
-#include "polyMesh.H"
-#include "line.H"
-#include "Random.H"
-#include "treeBoundBox.H"
-#include "bitSet.H"
-#include "HashSet.H"
-#include "ListOps.H"
-
-using namespace Foam;
-
-//- simple helper to create a cube, given lower corner and width
-boundBox cube(scalar start, scalar width)
-{
-    return boundBox
-    (
-        point::uniform(start),
-        point::uniform(start + width)
-    );
-}
-
-//- simple helper to create a cube, given mid-point and width
-boundBox cubeAt(const point& mid, scalar width)
-{
-    boundBox bb(mid);
-    bb.grow(0.5*width);
-
-    return bb;
-}
-
-
-word faceName(direction whichFace)
-{
-    switch (whichFace)
-    {
-        case treeBoundBox::LEFT   : return "-x";
-        case treeBoundBox::RIGHT  : return "+x";
-
-        case treeBoundBox::BOTTOM : return "-y";
-        case treeBoundBox::TOP    : return "+y";
-
-        case treeBoundBox::BACK   : return "-z";
-        case treeBoundBox::FRONT  : return "+z";
-    }
-
-    return "??";
-}
-
-
-word octantName(direction octant)
-{
-    word str("-x-y-z");
-
-    if (octant & treeBoundBox::RIGHTHALF)
-    {
-        str[0] = '+';
-    }
-    if (octant & treeBoundBox::TOPHALF)
-    {
-        str[2] = '+';
-    }
-    if (octant & treeBoundBox::FRONTHALF)
-    {
-        str[4] = '+';
-    }
-    return str;
-}
-
-
-void testOverlaps(const treeBoundBox& bb, const treeBoundBox& searchBox)
-{
-    FixedList<bool, 8> overlaps;
-
-    for (direction octant = 0; octant < 8; ++octant)
-    {
-        overlaps[octant] = bb.subOverlaps(octant, searchBox);
-    }
-
-    Info<< "box " << bb << " and " << searchBox << nl;
-
-    Info<< "overlaps any:" << bb.overlaps(searchBox)
-        << " octants: " << overlaps << nl;
-}
-
-
-void testOverlaps
-(
-    const treeBoundBox& bb,
-    const point& sample,
-    const scalar nearestDistSqr
-)
-{
-    FixedList<bool, 8> overlaps;
-
-    for (direction octant = 0; octant < 8; ++octant)
-    {
-        overlaps[octant] = bb.subOverlaps(octant, sample, nearestDistSqr);
-    }
-
-    Info<< "box " << bb << " and "
-        << sample << " distSqr:" << nearestDistSqr << nl;
-
-    Info<< "overlaps any:" << bb.overlaps(sample, nearestDistSqr)
-        << " octants: " << overlaps << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    #include "setRootCase.H"
-
-    treeBoundBox bb(cube(0, 1));
-    treeBoundBox sub(cube(0.1, 0.8));
-
-    Info<< nl
-        << "box: " << bb << nl;
-
-    Info<< nl;
-    for (direction octant = 0; octant < 8; ++octant)
-    {
-        Info<< "octant:" << octant
-            << " (" << octantName(octant) << ") = "
-            << bb.subBbox(octant) << nl;
-    }
-
-    Info<< nl;
-    for (direction facei = 0; facei < 6; ++facei)
-    {
-        Info<< "sub-half:" << facei
-            << " (" << faceName(facei) << ") = "
-            << bb.subHalf(facei) << nl;
-    }
-
-    Info<< nl;
-    for (direction octant = 0; octant < 8; ++octant)
-    {
-        const point pt = sub.corner(octant);
-        const direction subOctant = bb.subOctant(pt);
-
-        Info<< "point:" << pt
-            << " in octant " << subOctant
-            << " sub-box: " << bb.subBbox(subOctant) << nl;
-    }
-
-    for (const scalar dist : {0.1})
-    {
-        Info<< nl;
-        for (direction octant = 0; octant < 8; ++octant)
-        {
-            treeBoundBox searchBox(cubeAt(bb.corner(octant), dist));
-            testOverlaps(bb, searchBox);
-        }
-
-        Info<< nl;
-        for (direction facei = 0; facei < 6; ++facei)
-        {
-            treeBoundBox searchBox(cubeAt(bb.faceCentre(facei), dist));
-            testOverlaps(bb, searchBox);
-        }
-    }
-
-    {
-        treeBoundBox largerBox(bb);
-        largerBox.grow(0.2);
-
-        // Checking at corners,
-        // larger by 0.2 in three directions: radius = 0.3464
-
-        for (const scalar dist : {0.1, 0.35})
-        {
-            const scalar distSqr = sqr(dist);
-
-            Info<< nl;
-            for (direction octant = 0; octant < 8; ++octant)
-            {
-                testOverlaps(bb, largerBox.corner(octant), distSqr);
-            }
-        }
-
-        // Checking at face centres,
-        // larger by 0.2 in a single direction
-
-        for (const scalar dist : {0.1, 0.25})
-        {
-            const scalar distSqr = sqr(dist);
-
-            Info<< nl;
-            for (direction facei = 0; facei < 6; ++facei)
-            {
-                testOverlaps(bb, largerBox.faceCentre(facei), distSqr);
-            }
-        }
-    }
-
-    Info<< nl << "End" << nl << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //

applications/test/edges/Test-edges.C

@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
     Info<<"collapse? -> " << e4.collapse() << endl;
     printInfo(e4);
 
-    Info<< e3 << " connects " << e2 << " => " << e2.connected(e3) << endl;
+    Info<< e3 << " connects " << e2 << " => " << e2.connects(e3) << endl;
 
     labelPair labels(e3);
 

applications/test/faces/Test-faces.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,7 +33,6 @@ Description
 
 #include "argList.H"
 #include "labelledTri.H"
-#include "edge.H"
 #include "faceList.H"
 #include "triFaceList.H"
 #include "pointList.H"
@@ -132,25 +131,10 @@ int main(int argc, char *argv[])
     testSign(f1, points2, testPoints);
     Info<< nl;
 
-    // Initializer list
-    // triFace t1({1, 2, 3});
-
-    // Component-wise
-    {
-        edge e1(3, 2, 1);  // Inadvertent sort!!!
-        Info<< "edge:" << e1 << nl;
-    }
-
-    // Component-wise
-    triFace t1(1, 2, 3);
+    triFace t1({1, 2, 3});
     Info<< "triFace:"; faceInfo(t1, points1); Info << nl;
     testSign(t1, points1, testPoints);
 
-    {
-        scalarField fld({0, 20, 20, 30});
-        Info<< "avg:" << t1.average(pointField::null(), fld) << nl;
-    }
-
     Info<< "triFace:"; faceInfo(t1, points2); Info << nl;
     testSign(t1, points2, testPoints);
     Info<< nl;

applications/test/findCell-octree/Test-findCell-octree.C

@@ -53,17 +53,20 @@ int main(int argc, char *argv[])
     const polyMesh::cellDecomposition decompMode = polyMesh::CELL_TETS;
 
     treeBoundBox meshBb(mesh.bounds());
-    treeBoundBox shiftedBb(meshBb);
 
     // Calculate typical cell related size to shift bb by.
     scalar typDim = meshBb.avgDim()/(2.0*Foam::cbrt(scalar(mesh.nCells())));
 
-    shiftedBb.max() += vector::uniform(typDim);
+    treeBoundBox shiftedBb
+    (
+        meshBb.min(),
+        meshBb.max() + vector(typDim, typDim, typDim)
+    );
 
     Info<< "Mesh" << endl;
     Info<< "   bounding box           : " << meshBb << endl;
     Info<< "   bounding box (shifted) : " << shiftedBb << endl;
-    Info<< "   typical dimension      : " << shiftedBb.avgDim() << endl;
+    Info<< "   typical dimension      : " << shiftedBb.typDim() << endl;
 
     Info<< "Initialised mesh in "
         << runTime.cpuTimeIncrement() << " s" << endl;

applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C

@@ -67,10 +67,17 @@ int main(int argc, char *argv[])
     treeBoundBox bb(efem.points());
     bb.grow(ROOTVSMALL);
 
+    labelList allEdges(identity(efem.edges().size()));
+
     indexedOctree<treeDataEdge> edgeTree
     (
-        treeDataEdge(efem.edges(), efem.points()),   // All edges
-
+        treeDataEdge
+        (
+            false,          // cachebb
+            efem.edges(),        // edges
+            efem.points(),       // points
+            allEdges        // selected edges
+        ),
         bb,     // bb
         8,      // maxLevel
         10,     // leafsize

applications/test/foamToEnsight-check/Make/files

@@ -1,3 +0,0 @@
-foamToEnsight-check.C
-
-EXE = $(FOAM_USER_APPBIN)/foamToEnsight-check

applications/test/foamToEnsight-check/Make/options

@@ -1,16 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/conversion/lnInclude \
-    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -lfiniteArea \
-    -lfileFormats \
-    -lmeshTools \
-    -lconversion \
-    -llagrangianIntermediate \
-    -lgenericPatchFields

applications/test/foamToEnsight-check/foamToEnsight-check.C

@@ -1,357 +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/>.
-
-Application
-    foamToEnsight-check
-
-Description
-    Check data sizes for conversion to ensight format.
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "timeSelector.H"
-#include "IOobjectList.H"
-#include "IOmanip.H"
-#include "OFstream.H"
-#include "Pstream.H"
-#include "HashOps.H"
-#include "regionProperties.H"
-
-#include "fvc.H"
-#include "faMesh.H"
-#include "fvMesh.H"
-
-// file-format/conversion
-#include "ensightFaMesh.H"
-#include "ensightMesh.H"
-
-using namespace Foam;
-
-
-void printStats(const FixedList<label, 3>& stats, const char *what = "")
-{
-    Info<< what << "max-comm: "<< stats[0] << nl
-        << what << "max-size: "<< stats[1] << nl
-        << what << "off-proc: "<< stats[2] << nl;
-}
-
-
-template<class EnsightPartType>
-FixedList<label, 3> printPartInfo
-(
-    const EnsightPartType& part,
-    int verbose = 0
-)
-{
-    Info<< "part: " << part.name().c_str() << nl
-        << "    size: "
-        << (Pstream::parRun() ? part.total() : part.size())
-        << " (";
-
-    FixedList<label, 3> stats(Zero);
-
-    label& maxComm = stats[0];
-    label& maxSize = stats[1];
-    label& totNonLocalSize = stats[2];
-
-    for (int typei=0; typei < EnsightPartType::nTypes; ++typei)
-    {
-        const auto etype = typename EnsightPartType::elemType(typei);
-
-        if (typei) Info<< ' ';
-        Info<< EnsightPartType::elemNames[etype] << ": "
-            << (Pstream::parRun() ? part.total(etype) : part.size(etype));
-
-        label elemCount = part.size(etype);
-        label commCount = (Pstream::master() ? label(0) : elemCount);
-        label nonLocalCount = commCount;
-
-        if (Pstream::parRun())
-        {
-            reduce(elemCount, maxOp<label>());
-            reduce(commCount, maxOp<label>());
-
-            reduce(nonLocalCount, sumOp<label>());
-        }
-
-        maxComm = max(maxComm, commCount);
-        maxSize = max(maxSize, elemCount);
-        totNonLocalSize = max(totNonLocalSize, nonLocalCount);
-    }
-    Info<< ")" << endl;
-
-    if (verbose && Pstream::parRun() && part.total())
-    {
-        for (int typei=0; typei < EnsightPartType::nTypes; ++typei)
-        {
-            const auto etype = typename EnsightPartType::elemType(typei);
-
-            label elemCount = part.size(etype);
-            label totCount = part.total(etype);
-
-            Info<< "    "
-                << EnsightPartType::elemNames[etype] << ": "
-                << totCount;
-
-            if (totCount)
-            {
-                labelList sizes(UPstream::listGatherValues(elemCount));
-
-                Info<< "  ";
-                sizes.writeList(Info);
-            }
-
-            Info<< endl;
-        }
-    }
-
-    printStats(stats, "    ");
-
-    return stats;
-}
-
-
-void printInfo(const ensightMesh& mesh, int verbose = 0)
-{
-    FixedList<label, 3> cellStats(Zero);
-    FixedList<label, 3> faceStats(Zero);
-
-    for (const auto& iter : mesh.cellZoneParts().sorted())
-    {
-        FixedList<label, 3> stats = printPartInfo(iter.val(), verbose);
-
-        for (label i=0; i < 3; ++i)
-        {
-            cellStats[i] = max(cellStats[i], stats[i]);
-        }
-    }
-
-    for (const auto& iter : mesh.faceZoneParts().sorted())
-    {
-        FixedList<label, 3> stats = printPartInfo(iter.val(), verbose);
-
-        for (label i=0; i < 3; ++i)
-        {
-            faceStats[i] = max(faceStats[i], stats[i]);
-        }
-    }
-
-    for (const auto& iter : mesh.boundaryParts().sorted())
-    {
-        FixedList<label, 3> stats = printPartInfo(iter.val(), verbose);
-
-        for (label i=0; i < 3; ++i)
-        {
-            faceStats[i] = max(faceStats[i], stats[i]);
-        }
-    }
-
-    Info<< nl
-        << "===============" << nl;
-    printStats(cellStats, "cell ");
-
-    Info<< nl;
-    printStats(faceStats, "face ");
-
-    Info<< "===============" << endl;
-}
-
-
-void printInfo(const ensightFaMesh& mesh, int verbose = 0)
-{
-    printPartInfo(mesh.areaPart());
-}
-
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    argList::addNote
-    (
-        "Check data sizes for conversion of OpenFOAM to Ensight format"
-    );
-    // timeSelector::addOptions();
-
-    // Less frequently used - reduce some clutter
-    argList::setAdvanced("decomposeParDict");
-
-    argList::addVerboseOption("Additional verbosity");
-
-    #include "addAllRegionOptions.H"
-
-    argList::addBoolOption
-    (
-        "no-boundary",  // noPatches
-        "Suppress writing any patches"
-    );
-    argList::addBoolOption
-    (
-        "no-internal",
-        "Suppress writing the internal mesh"
-    );
-    argList::addBoolOption
-    (
-        "no-cellZones",
-        "Suppress writing any cellZones"
-    );
-    argList::addBoolOption
-    (
-        "no-finite-area",
-        "Suppress output of finite-area mesh/fields",
-        true  // mark as an advanced option
-    );
-
-    #include "setRootCase.H"
-
-    // ------------------------------------------------------------------------
-    // Configuration
-
-    const int optVerbose = args.verbose();
-    const bool doBoundary    = !args.found("no-boundary");
-    const bool doInternal    = !args.found("no-internal");
-    const bool doCellZones   = !args.found("no-cellZones");
-    const bool doFiniteArea  = !args.found("no-finite-area");
-
-    ensightMesh::options writeOpts;
-    writeOpts.useBoundaryMesh(doBoundary);
-    writeOpts.useInternalMesh(doInternal);
-    writeOpts.useCellZones(doCellZones);
-
-    // ------------------------------------------------------------------------
-
-    #include "createTime.H"
-
-    instantList timeDirs = timeSelector::select0(runTime, args);
-
-    // Handle -allRegions, -regions, -region
-    #include "getAllRegionOptions.H"
-
-    // ------------------------------------------------------------------------
-
-    #include "createNamedMeshes.H"
-
-    // ------------------------------------------------------------------------
-    /// #include "createMeshAccounting.H"
-
-    PtrList<ensightMesh> ensightMeshes(regionNames.size());
-    PtrList<faMesh> meshesFa(regionNames.size());
-    PtrList<ensightFaMesh> ensightMeshesFa(regionNames.size());
-
-    forAll(regionNames, regioni)
-    {
-        const fvMesh& mesh = meshes[regioni];
-
-        ensightMeshes.set
-        (
-            regioni,
-            new ensightMesh(mesh, writeOpts)
-        );
-        ensightMeshes[regioni].verbose(optVerbose);
-
-
-        if (doFiniteArea)
-        {
-            autoPtr<faMesh> faMeshPtr(faMesh::TryNew(mesh));
-
-            if (faMeshPtr)
-            {
-                meshesFa.set(regioni, std::move(faMeshPtr));
-
-                ensightMeshesFa.set
-                (
-                    regioni,
-                    new ensightFaMesh(meshesFa[regioni])
-                );
-                ensightMeshesFa[regioni].verbose(optVerbose);
-            }
-        }
-    }
-
-    // ------------------------------------------------------------------------
-
-
-    if (Pstream::master())
-    {
-        Info<< "Checking " << timeDirs.size() << " time steps" << nl;
-    }
-
-    forAll(timeDirs, timei)
-    {
-        runTime.setTime(timeDirs[timei], timei);
-
-        forAll(regionNames, regioni)
-        {
-            const word& regionName = regionNames[regioni];
-            // const word& regionDir = polyMesh::regionName(regionName);
-
-            auto& mesh = meshes[regioni];
-
-            polyMesh::readUpdateState meshState = mesh.readUpdate();
-            const bool moving = (meshState != polyMesh::UNCHANGED);
-
-            auto& ensMesh = ensightMeshes[regioni];
-
-            // Finite-area (can be missing)
-            auto* ensFaMeshPtr = ensightMeshesFa.get(regioni);
-
-            if (moving)
-            {
-                ensMesh.expire();
-                ensMesh.correct();
-
-                if (ensFaMeshPtr)
-                {
-                    ensFaMeshPtr->expire();
-                    ensFaMeshPtr->correct();
-                }
-            }
-
-            if (moving || timei == 0)  // report
-            {
-                if (regionNames.size() > 1)
-                {
-                    Info<< "region=" << regionName << nl;
-                }
-
-                printInfo(ensMesh, optVerbose);
-
-                if (ensFaMeshPtr)
-                {
-                    printInfo(*ensFaMeshPtr, optVerbose);
-                }
-            }
-        }
-    }
-
-    Info<< "\nEnd"<< nl << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //

applications/test/matrices/EigenMatrix/Test-EigenMatrix.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is derivative work of OpenFOAM.
@@ -49,6 +49,20 @@ using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Return the absolute tolerance value for bitwise comparisons of floatScalars
+floatScalar getTol(floatScalar)
+{
+    return 1e-2;
+}
+
+
+// Return the absolute tolerance value for bitwise comparisons of doubleScalars
+doubleScalar getTol(doubleScalar)
+{
+    return 1e-10;
+}
+
+
 // Create each constructor of EigenMatrix<Type>, and print output
 template<class Type>
 void test_constructors(Type)

applications/test/openmp/Make/files

@@ -1,3 +1,3 @@
-Test-openmp.cpp
+Test-openmp.C
 
 EXE = $(FOAM_USER_APPBIN)/Test-openmp

applications/test/openmp/Test-openmp.C

@@ -41,13 +41,8 @@ Description
 
 int main(int argc, char *argv[])
 {
-    std::cout
-        << "c++ = " << __cplusplus << '\n';
-
 #if _OPENMP
-    std::cout
-        << "openmp = " << _OPENMP << '\n'
-        << "Initial threads = " << omp_get_num_threads() << "\n\n";
+    std::cout << "_OPENMP = " << _OPENMP << "\n\n";
 
     // Fork threads with their own copies of variables
     int nThreads, threadId;
@@ -57,15 +52,15 @@ int main(int argc, char *argv[])
         threadId = omp_get_thread_num();
         nThreads = omp_get_num_threads();
 
+        // Printf rather than cout to ensure that it emits in one go
+        printf("Called from thread = %d\n", threadId);
+
         // Master thread
         if (threadId == 0)
         {
             // Printf rather than cout to ensure that it emits in one go
             printf("Number of threads = %d\n", nThreads);
         }
-
-        // Printf rather than cout to ensure that it emits in one go
-        printf("Called from thread = %d\n", threadId);
     }
 #else
     std::cout << "Compiled without openmp!\n";

applications/test/surfaceTree/Make/files

@@ -1,3 +0,0 @@
-Test-surfaceTree.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-surfaceTree

applications/test/surfaceTree/Make/options

@@ -1,9 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/surfMesh/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lfileFormats \
-    -lsurfMesh \
-    -lmeshTools

applications/test/surfaceTree/Test-surfaceTree.C

@@ -1,157 +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/>.
-
-Application
-    Test-surfaceTree
-
-Description
-    Simple tests for building indexedOctree etc.
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "clockTime.H"
-#include "MeshedSurfaces.H"
-#include "indexedOctree.H"
-#include "AABBTree.H"
-#include "treeDataPrimitivePatch.H"
-#include "Random.H"
-#include "ListListOps.H"
-
-using namespace Foam;
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    argList::addNote
-    (
-        "Test octree building etc"
-    );
-
-    argList::noBanner();
-    argList::noParallel();
-    argList::addArgument("input", "The input surface file");
-
-    argList::addOption("maxLevel", "int", "The max level");
-    argList::addOption("leafSize", "int", "The min leaf size");
-    argList::addBoolOption("AABB", "AABBTree instead of indexedOctree");
-
-    argList args(argc, argv);
-
-    const auto importName = args.get<fileName>(1);
-
-    const bool useAABB = args.found("AABB");
-
-    label maxLevel = 10;
-    label leafSize = 10;
-
-    if (useAABB)
-    {
-        // May want different settings..
-    }
-
-    args.readIfPresent("maxLevel", maxLevel);
-    args.readIfPresent("leafSize", leafSize);
-
-    meshedSurface surf(importName);
-
-    Random rndGen(123456);
-
-    treeBoundBox overallBb
-    (
-        treeBoundBox(surf.box()).extend(rndGen, 1e-4, ROOTVSMALL)
-    );
-
-    Info<< "Surface with " << surf.size() << " faces, "
-        << surf.nPoints() << " points" << endl;
-
-
-    clockTime timing;
-
-    if (useAABB)
-    {
-        AABBTree<face> tree
-        (
-            surf,
-            surf.points(),
-            true,       // Equal bins
-            maxLevel,   // maxLevel
-            leafSize    // minLeafSize
-        );
-
-        Info<< "Built AABBTree, maxLevel:" << maxLevel
-            << " minLeaf:" << leafSize
-            << " with " << tree.boundBoxes().size()
-            << " leaves - " << timing.elapsedTime() << 's' << endl;
-
-        {
-            OFstream os("AABBTree.obj");
-            tree.writeOBJ(os);
-
-            Info<< "Wrote " << os.name() << endl;
-        }
-
-        // Info<< "sizes: ";
-        // ListListOps::subSizes
-        // (
-        //     tree.addressing(),
-        //     identityOp{}
-        // ).writeList(Info) << endl;
-    }
-    else
-    {
-        indexedOctree<treeDataPrimitivePatch<meshedSurface>> tree
-        (
-            treeDataPrimitivePatch<meshedSurface>(surf, 1e-6),
-            overallBb,
-            maxLevel,   // maxLevel
-            leafSize,   // leafSize
-            3.0         // duplicity
-        );
-
-        Info<< "Built octree, maxLevel:" << maxLevel
-            << " minLeaf:" << leafSize
-            << " with " << tree.nodes().size()
-            << " nodes, " << tree.nLeafs()
-            << " leaves - " << timing.elapsedTime() << 's' << endl;
-
-        {
-            OFstream os("indexedOctree.obj");
-            tree.writeOBJ(os);
-
-            Info<< "Wrote " << os.name() << endl;
-        }
-    }
-
-
-    Info<< "\nEnd\n" << endl;
-    return 0;
-}
-
-
-// ************************************************************************* //

applications/test/triTet/Test-triTet.C

@@ -1,4 +1,3 @@
-#include "argList.H"
 #include "point.H"
 #include "triangle.H"
 #include "tetrahedron.H"
@@ -6,7 +5,7 @@
 
 using namespace Foam;
 
-int main(int argc, char *argv[])
+int main()
 {
     triangle<point, point> tri
     (
@@ -15,12 +14,6 @@ int main(int argc, char *argv[])
         vector(1, 1, 0)
     );
 
-    Info<< "triangle: " << tri << nl
-        << "  vecA: " << tri.vecA() << nl
-        << "  vecB: " << tri.vecB() << nl
-        << "  vecC: " << tri.vecC() << nl
-        << endl;
-
     Info<< "tri circumCentre = " << tri.circumCentre() << endl;
     Info<< "tri circumRadius = " << tri.circumRadius() << endl;
 
@@ -35,8 +28,6 @@ int main(int argc, char *argv[])
     Info<< "tet circumCentre = " << tet.circumCentre() << endl;
     Info<< "tet circumRadius = " << tet.circumRadius() << endl;
 
-    InfoErr<< "Enter four points: " << endl;
-
     vector a(Sin);
     vector b(Sin);
     vector c(Sin);
@@ -45,6 +36,5 @@ int main(int argc, char *argv[])
     Info<< "tet circumRadius = "
         << tetrahedron<point, point>(a, b, c, d).circumRadius() << endl;
 
-    Info<< "\nEnd\n";
     return 0;
 }

applications/test/triangleIntersection/Make/files

@@ -1,3 +0,0 @@
-Test-triangleIntersection.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-triangleIntersection

applications/test/triangleIntersection/Make/options

@@ -1,5 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lmeshTools

applications/test/triangleIntersection/Test-triangleIntersection.C

@@ -1,142 +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/>.
-
-Description
-    Test bounding box / triangle intersection
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "Time.H"
-#include "line.H"
-#include "Random.H"
-#include "triangle.H"
-#include "triangleFuncs.H"
-#include "treeBoundBox.H"
-#include "ListOps.H"
-
-using namespace Foam;
-
-//- simple helper to create a cube
-boundBox cube(scalar start, scalar width)
-{
-    return boundBox
-    (
-        point::uniform(start),
-        point::uniform(start + width)
-    );
-}
-
-
-void printEdges(const treeBoundBox& bb)
-{
-    pointField pts(bb.points());
-
-    for (const edge& e : treeBoundBox::edges)
-    {
-        Info<< pts[e.first()] << " -> " << pts[e.second()] << nl;
-    }
-}
-
-
-void testIntersect(const treeBoundBox& bb, const triPoints& tri)
-{
-    int ninside = 0;
-
-    if (bb.contains(tri.a())) ++ninside;
-    if (bb.contains(tri.b())) ++ninside;
-    if (bb.contains(tri.c())) ++ninside;
-
-    Info<< "box: " << bb << endl;
-    Info<< "tri: " << tri << endl;
-
-    Info<< "num inside: " << ninside << nl;
-    Info<< "intersects: " << bb.intersects(tri.tri())
-        << ' ' << triangleFuncs::intersectBb(tri.tri(), bb) << nl << endl;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    argList args(argc, argv);
-
-    // Info<<"tree-bb faces: " << treeBoundBox::faces << nl
-    //     <<"tree-bb edges: " << treeBoundBox::edges << endl;
-
-    treeBoundBox bb;
-    bb = cube(0, 1);
-
-    triPoints tri;
-    tri.a() = point(-0.1, 0.5, 0.5);
-    tri.b() = point(0.1, 0.6, 0.5);
-    tri.c() = point(0.2, 0.4, 0.5);
-
-    testIntersect(bb, tri);
-
-    tri.a().z() = 1.1;
-    tri.b().z() = 1.1;
-    tri.c().z() = 1.1;
-
-    testIntersect(bb, tri);
-
-    tri.a().z() = 1 + 1e-15;
-    tri.b().z() = 1 + 1e-15;
-    tri.c().z() = 1 + 1e-15;
-
-    testIntersect(bb, tri);
-
-    tri.a() = point(-1, -1, -1);
-    tri.b() = point(2, 2, -2);
-    tri.c() = point(0, 0, 2);
-
-    testIntersect(bb, tri);
-
-    tri.a() = point(0.9, 1.1, 0);
-    tri.b() = point(1.1, 0.9, 0);
-    tri.c() = point(1, 1, 1.1);
-
-    testIntersect(bb, tri);
-
-
-    tri.a() = point(-1e-3, 1e-3,  -1);
-    tri.b() = point( 1e-3, -1e-3, -1);
-    tri.c() = point(0, 0, 2);
-
-    testIntersect(bb, tri);
-
-    tri.a() = point(-1e-3, 1e-3,  -1);
-    tri.b() = point( 1e-3, -1e-3, -1);
-    tri.c() = point(-1e-4, -1e-4, 2);
-
-    testIntersect(bb, tri);
-
-    return 0;
-}
-
-
-// ************************************************************************* //

applications/test/write-wrapped-string/Make/files

@@ -1,3 +0,0 @@
-Test-write-wrapped-string.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-write-wrapped-string

applications/test/write-wrapped-string/Make/options

@@ -1,2 +0,0 @@
-/* EXE_INC = */
-/* EXE_LIBS = */

applications/test/write-wrapped-string/Test-write-wrapped-string.C

@@ -1,93 +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/>.
-
-Application
-    Test-write-wrapped-string
-
-Description
-    Simple tests for wrapped strings
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "stringOps.H"
-
-using namespace Foam;
-
-void print(const std::string& str, std::size_t width, std::size_t indent=0)
-{
-    auto& os = Info();
-
-    os  << nl
-        << "string[" << str.size() << "]" << nl
-        << str.c_str() << "<<<<" << nl
-        << "indent:" << indent << " width:" << width << endl;
-
-    for (size_t i = 0; i < width; ++i)
-    {
-        os << '=';
-    }
-    os << endl;
-
-    stringOps::writeWrapped(os, str, width, indent);
-
-    for (size_t i = 0; i < width; ++i)
-    {
-        os << '=';
-    }
-    os << endl;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    argList::noBanner();
-    argList::noParallel();
-
-    #include "setRootCase.H"
-
-    {
-        string test =
-            "123456789-12345\n\n"
-            "6789-12\t"
-            "xyz3456789-1234    56789-123456789-";
-
-        print(test, 10, 4);
-    }
-
-    {
-        string test = "ABCDEFGHI";
-        print(test, 10, 4);
-    }
-
-    Info<< "\nEnd\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //

applications/utilities/finiteArea/checkFaMesh/checkFaMesh.C

@@ -95,8 +95,7 @@ int main(int argc, char *argv[])
 
     Info<< "Time = " << runTime.timeName() << nl << endl;
 
-    // Mesh information (verbose)
-    faMeshTools::printMeshChecks(aMesh);
+    #include "printMeshSummary.H"
 
     if (args.found("write-vtk"))
     {

applications/utilities/finiteArea/checkFaMesh/printMeshSummary.H

@@ -8,37 +8,15 @@
     Copyright (C) 2021-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
-    This file is part of OpenFOAM.
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+Description
+    Summary of faMesh information
 
 \*---------------------------------------------------------------------------*/
 
-#include "faMeshTools.H"
-#include "areaFields.H"
-#include "edgeFields.H"
-#include "processorFaPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void Foam::faMeshTools::printMeshChecks
-(
-    const faMesh& mesh,
-    const int verbose
-)
 {
-    const faBoundaryMesh& patches = mesh.boundary();
+    const faBoundaryMesh& patches = aMesh.boundary();
     const label nNonProcessor = patches.nNonProcessor();
     const label nPatches = patches.size();
 
@@ -58,19 +36,19 @@ void Foam::faMeshTools::printMeshChecks
 
     const labelList nFaces
     (
-        UPstream::listGatherValues<label>(mesh.nFaces())
+        UPstream::listGatherValues<label>(aMesh.nFaces())
     );
     const labelList nPoints
     (
-        UPstream::listGatherValues<label>(mesh.nPoints())
+        UPstream::listGatherValues<label>(aMesh.nPoints())
     );
     const labelList nEdges
     (
-        UPstream::listGatherValues<label>(mesh.nEdges())
+        UPstream::listGatherValues<label>(aMesh.nEdges())
     );
     const labelList nIntEdges
     (
-        UPstream::listGatherValues<label>(mesh.nInternalEdges())
+        UPstream::listGatherValues<label>(aMesh.nInternalEdges())
     );
 
     // The "real" (non-processor) boundary edges
@@ -78,7 +56,7 @@ void Foam::faMeshTools::printMeshChecks
     (
         UPstream::listGatherValues<label>
         (
-            mesh.nBoundaryEdges() - nLocalProcEdges
+            aMesh.nBoundaryEdges() - nLocalProcEdges
         )
     );
     const labelList nProcEdges
@@ -92,10 +70,10 @@ void Foam::faMeshTools::printMeshChecks
     //         per-proc: (...)
 
     const auto reporter =
-        [&,verbose](const char* tag, const labelList& list)
+        [&](const char* tag, const labelList& list)
         {
             Info<< "  Number of " << tag << ": " << sum(list) << nl;
-            if (Pstream::parRun() && verbose)
+            if (Pstream::parRun())
             {
                 int padding = static_cast<int>
                 (
@@ -114,7 +92,7 @@ void Foam::faMeshTools::printMeshChecks
     Info<< "----------------" << nl
         << "Mesh Information" << nl
         << "----------------" << nl
-        << "  " << "boundingBox: " << boundBox(mesh.points()) << nl;
+        << "  " << "boundingBox: " << boundBox(aMesh.points()) << nl;
 
     if (Pstream::master())
     {
@@ -146,26 +124,26 @@ void Foam::faMeshTools::printMeshChecks
     }
 
     Info<< "----------------" << nl
-        << "Used polyPatches: " << flatOutput(mesh.whichPolyPatches()) << nl;
+        << "Used polyPatches: " << flatOutput(aMesh.whichPolyPatches()) << nl;
 
 
     // Geometry information
     Info<< nl;
     {
-        scalarMinMax limit(gMinMax(mesh.S().field()));
+        scalarMinMax limit(gMinMax(aMesh.S().field()));
         Info<< "Face area:" << nl
             << "    min = " << limit.min() << " max = "  << limit.max() << nl;
     }
 
     {
-        scalarMinMax limit(minMax(mesh.magLe().primitiveField()));
+        scalarMinMax limit(minMax(aMesh.magLe().primitiveField()));
 
         // Include processor boundaries into 'internal' edges
         if (Pstream::parRun())
         {
             for (label patchi = nNonProcessor; patchi < nPatches; ++patchi)
             {
-                limit.add(minMax(mesh.magLe().boundaryField()[patchi]));
+                limit.add(minMax(aMesh.magLe().boundaryField()[patchi]));
             }
 
             reduce(limit, minMaxOp<scalar>());
@@ -178,7 +156,7 @@ void Foam::faMeshTools::printMeshChecks
         // Include (non-processor) boundaries
         for (label patchi = 0; patchi < nNonProcessor; ++patchi)
         {
-            limit.add(minMax(mesh.magLe().boundaryField()[patchi]));
+            limit.add(minMax(aMesh.magLe().boundaryField()[patchi]));
         }
 
         if (Pstream::parRun())
@@ -193,7 +171,7 @@ void Foam::faMeshTools::printMeshChecks
     // Not particularly meaningful
     #if 0
     {
-        MinMax<vector> limit(gMinMax(mesh.faceAreaNormals().field()));
+        MinMax<vector> limit(gMinMax(aMesh.faceAreaNormals().field()));
 
         Info<< "Face area normals:" << nl
             << "    min = " << limit.min() << " max = " << limit.max() << nl;

applications/utilities/finiteArea/makeFaMesh/decomposeFaFields.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -15,78 +15,47 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-// Embed do-while to support early termination
 if (doDecompose && Pstream::parRun())
-do
 {
-    faMeshReconstructor reconstructor(aMesh, IOobjectOption::READ_IF_PRESENT);
+    faMeshReconstructor reconstructor(aMesh);
+    reconstructor.writeAddressing();
 
-    if (!reconstructor.good())
-    {
-        Info<< "Missing volume proc-addressing, "
-               "cannot generate area proc-addressing." << nl
-            << "Also skip decomposing area fields...."
-            << endl;
-        break;
-    }
-
-    reconstructor.writeMesh();          // Writes on master only
-    reconstructor.writeAddressing();    // Writes per-proc
-
-    Info<< "Wrote proc-addressing and serial mesh" << nl << endl;
+    Info<< "Wrote proc-addressing" << nl << endl;
 
     // Handle area fields
     // ------------------
 
     faFieldDecomposer::fieldsCache areaFieldsCache;
 
-    const faMesh& serialMesh = reconstructor.mesh();
+    const faMesh& fullMesh = reconstructor.mesh();
 
-    if (doDecompFields)
     {
-        // The serial finite-area mesh exists and is identical on all
-        // processors, but its fields can only reliably be read on the
-        // master (eg, running with distributed roots).
-        //
-        // - mark mesh fields as readable on master only (haveMeshOnProc)
-        // - 'subset' entire serial mesh so that a full copy will be
-        //   broadcast to other ranks (subsetterPtr)
-        // - scan available IOobjects on the master only
+        // Use uncollated (or master uncollated) file handler here.
+        // - each processor is reading in the identical serial fields.
+        // - nothing should be parallel-coordinated.
 
-        bitSet haveMeshOnProc;
-        std::unique_ptr<faMeshSubset> subsetter;
-        IOobjectList objects(0);
+        // Similarly, if we write the serial finite-area mesh, this is only
+        // done from one processor!
 
-        const bool oldDistributed = fileHandler().distributed();
-        auto oldHandler = fileHandler(fileOperation::NewUncollated());
-        fileHandler().distributed(true);
+        reconstructor.writeMesh();
 
-        if (Pstream::master())
+        if (doDecompFields)
         {
-            haveMeshOnProc.set(Pstream::myProcNo());
-            subsetter.reset(new faMeshSubset(serialMesh));
+            const bool oldDistributed = fileHandler().distributed();
+            auto oldHandler = fileHandler(fileOperation::NewUncollated());
+            fileHandler().distributed(true);
 
-            const bool oldParRun = Pstream::parRun(false);
+            IOobjectList objects(fullMesh.time(), runTime.timeName());
 
-            objects = IOobjectList(serialMesh.time(), runTime.timeName());
+            areaFieldsCache.readAllFields(fullMesh, objects);
 
-            Pstream::parRun(oldParRun);
+            // Restore old settings
+            if (oldHandler)
+            {
+                fileHandler(std::move(oldHandler));
+            }
+            fileHandler().distributed(oldDistributed);
         }
-
-        // Restore old settings
-        if (oldHandler)
-        {
-            fileHandler(std::move(oldHandler));
-        }
-        fileHandler().distributed(oldDistributed);
-
-        areaFieldsCache.readAllFields
-        (
-            haveMeshOnProc,
-            subsetter.get(),
-            serialMesh,
-            objects
-        );
     }
 
     const label nAreaFields = areaFieldsCache.size();
@@ -97,7 +66,7 @@ do
 
         faFieldDecomposer fieldDecomposer
         (
-            serialMesh,
+            fullMesh,
             aMesh,
             reconstructor.edgeProcAddressing(),
             reconstructor.faceProcAddressing(),
@@ -108,7 +77,7 @@ do
         areaFieldsCache.decomposeAllFields(fieldDecomposer, true);
         Info<< endl;
     }
-} while (false);
+}
 
 
 // ************************************************************************* //

applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,14 +42,13 @@ Original Authors
 #include "argList.H"
 #include "OSspecific.H"
 #include "faMesh.H"
-#include "faMeshTools.H"
 #include "IOdictionary.H"
 #include "IOobjectList.H"
+
 #include "areaFields.H"
 #include "edgeFields.H"
 #include "faFieldDecomposer.H"
 #include "faMeshReconstructor.H"
-#include "faMeshSubset.H"
 #include "PtrListOps.H"
 #include "foamVtkIndPatchWriter.H"
 #include "OBJstream.H"
@@ -132,8 +131,8 @@ int main(int argc, char *argv[])
     // Create
     faMesh aMesh(mesh, meshDefDict);
 
-    // Mesh information (less verbose)
-    faMeshTools::printMeshChecks(aMesh, 0);
+    // Mesh information
+    #include "printMeshSummary.H"
 
     if (args.found("write-edges-obj"))
     {

applications/utilities/finiteArea/makeFaMesh/printMeshSummary.H

@@ -0,0 +1,104 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021-2022 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+
+Description
+    Summary of faMesh information
+
+\*---------------------------------------------------------------------------*/
+
+{
+    const faBoundaryMesh& patches = aMesh.boundary();
+    const label nNonProcessor = patches.nNonProcessor();
+    const label nPatches = patches.size();
+
+    Info<< "----------------" << nl
+        << "Mesh Information" << nl
+        << "----------------" << nl
+        << "  " << "boundingBox: " << boundBox(aMesh.points()) << nl
+        << "  " << "nFaces: " << returnReduce(aMesh.nFaces(), sumOp<label>())
+        << nl;
+
+
+    Info<< "----------------" << nl
+        << "Patches" << nl
+        << "----------------" << nl;
+
+    for (label patchi = 0; patchi < nNonProcessor; ++patchi)
+    {
+        const faPatch& p = patches[patchi];
+
+        // Report physical size (nEdges) not virtual size
+        Info<< "  " << "patch " << p.index()
+            << " (size: " << returnReduce(p.nEdges(), sumOp<label>())
+            << ") name: " << p.name()
+            << nl;
+    }
+
+    Info<< "----------------" << nl
+        << "Used polyPatches: " << flatOutput(aMesh.whichPolyPatches()) << nl;
+
+
+    // Geometry information
+    Info<< nl;
+    {
+        scalarMinMax limit(gMinMax(aMesh.S().field()));
+        Info<< "Face area:" << nl
+            << "    min = " << limit.min() << " max = "  << limit.max() << nl;
+    }
+
+    {
+        scalarMinMax limit(minMax(aMesh.magLe().primitiveField()));
+
+        // Include processor boundaries into 'internal' edges
+        if (Pstream::parRun())
+        {
+            for (label patchi = nNonProcessor; patchi < nPatches; ++patchi)
+            {
+                limit.add(minMax(aMesh.magLe().boundaryField()[patchi]));
+            }
+
+            reduce(limit, minMaxOp<scalar>());
+        }
+
+        Info<< "Edge length (internal):" << nl
+            << "    min = " << limit.min() << " max = "  << limit.max() << nl;
+
+
+        // Include (non-processor) boundaries
+        for (label patchi = 0; patchi < nNonProcessor; ++patchi)
+        {
+            limit.add(minMax(aMesh.magLe().boundaryField()[patchi]));
+        }
+
+        if (Pstream::parRun())
+        {
+            reduce(limit, minMaxOp<scalar>());
+        }
+
+        Info<< "Edge length:" << nl
+            << "    min = " << limit.min()
+            << " max = "  << limit.max() << nl;
+    }
+
+    // Not particularly meaningful
+    #if 0
+    {
+        MinMax<vector> limit(gMinMax(aMesh.faceAreaNormals().field()));
+
+        Info<< "Face area normals:" << nl
+            << "    min = " << limit.min() << " max = " << limit.max() << nl;
+    }
+    #endif
+}
+
+
+// ************************************************************************* //

applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -88,7 +88,7 @@ label findPoint(const primitivePatch& pp, const point& nearPoint)
 
     for (const label pointi : meshPoints)
     {
-        scalar distSqr = nearPoint.distSqr(points[pointi]);
+        scalar distSqr = magSqr(nearPoint - points[pointi]);
 
         if (distSqr < minDistSqr)
         {
@@ -288,7 +288,7 @@ label findCell(const primitiveMesh& mesh, const point& nearPoint)
 
     if (celli != -1)
     {
-        scalar distToCcSqr = nearPoint.distSqr(mesh.cellCentres()[celli]);
+        scalar distToCcSqr = magSqr(nearPoint - mesh.cellCentres()[celli]);
 
         const labelList& cPoints = mesh.cellPoints()[celli];
 
@@ -297,7 +297,7 @@ label findCell(const primitiveMesh& mesh, const point& nearPoint)
 
         for (const label pointi : cPoints)
         {
-            scalar distSqr = nearPoint.distSqr(mesh.points()[pointi]);
+            scalar distSqr = magSqr(nearPoint - mesh.points()[pointi]);
 
             if (distSqr < minDistSqr)
             {

applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C

@@ -60,8 +60,8 @@ Usage
         Use numbered patch/zone (not names) directly from ccm ids.
 
       - \par -remap \<name\>
-        Alternative remapping dictionary
-        (default: <tt>constant/remapping</tt>)
+        Use specified remapping dictionary instead of
+        <tt>constant/remapping</tt>
 
       - \par -scale \<factor\>
         Specify an alternative geometry scaling factor.
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
     (
         "remap",
         "name",
-        "Alternative remapping dictionary (default: 'constant/remapping')"
+        "Use specified remapping dictionary instead of <constant/remapping>"
     );
     argList::addOption
     (

applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C

@@ -46,8 +46,8 @@ Usage
         No backup of existing output files.
 
       - \par -remap \<name\>
-        Alternative remapping dictionary
-        (default: <tt>constant/remapping</tt>)
+        Use specified remapping dictionary instead of
+        <tt>constant/remapping</tt>
 
       - \par -results
         Convert results only to CCM format
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
     (
         "remap",
         "name",
-        "Alternative remapping dictionary (default: 'constant/remapping')"
+        "Use specified remapping dictionary instead of <constant/remapping>"
     );
     argList::addBoolOption
     (

applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C

@@ -293,7 +293,7 @@ bool Foam::fileFormats::ensightMeshReader::readGoldPart
                 elemIdToCells
             );
 
-            const auto& model = cellModel::ref(cellModel::TET);
+            const auto& model = *cellModel::ptr(cellModel::TET);
             for (label shapei = 0; shapei < nShapes; shapei++)
             {
                 readVerts(is, 4, nodeIdToPoints, verts);
@@ -326,7 +326,7 @@ bool Foam::fileFormats::ensightMeshReader::readGoldPart
                 elemIdToCells
             );
 
-            const auto& model = cellModel::ref(cellModel::PYR);
+            const auto& model = *cellModel::ptr(cellModel::PYR);
             for (label shapei = 0; shapei < nShapes; shapei++)
             {
                 readVerts(is, 5, nodeIdToPoints, verts);
@@ -359,7 +359,7 @@ bool Foam::fileFormats::ensightMeshReader::readGoldPart
                 elemIdToCells
             );
 
-            const auto& model = cellModel::ref(cellModel::PRISM);
+            const auto& model = *cellModel::ptr(cellModel::PRISM);
             for (label shapei = 0; shapei < nShapes; shapei++)
             {
                 readVerts(is, 6, nodeIdToPoints, verts);
@@ -392,7 +392,7 @@ bool Foam::fileFormats::ensightMeshReader::readGoldPart
                 elemIdToCells
             );
 
-            const auto& model = cellModel::ref(cellModel::HEX);
+            const auto& model = *cellModel::ptr(cellModel::HEX);
             for (label shapei = 0; shapei < nShapes; shapei++)
             {
                 readVerts(is, 8, nodeIdToPoints, verts);

applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C

@@ -890,10 +890,11 @@ int main(int argc, char *argv[])
 
 
     const boundBox& bb = mesh.bounds();
+    const vector span = bb.span();
     const scalar mergeDim = mergeTol * bb.minDim();
 
     Info<< "Mesh bounding box : " << bb << nl
-        << "        with span : " << bb.span() << nl
+        << "        with span : " << span << nl
         << "Merge distance    : " << mergeDim << nl
         << endl;
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C

@@ -869,7 +869,9 @@ Foam::DistributedDelaunayMesh<Triangulation>::rangeInsertReferredWithInfo
 
         if (!bb.contains(samplePoint))
         {
-            distFromBbSqr = bb.nearest(samplePoint).distSqr(samplePoint);
+            const Foam::point nearestPoint = bb.nearest(samplePoint);
+
+            distFromBbSqr = magSqr(nearestPoint - samplePoint);
         }
 
         pointsBbDistSqr.append

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C

@@ -167,7 +167,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
             {
                 if (volumeStatus[celli] == volumeType::UNKNOWN)
                 {
-                    treeBoundBox cellBb(mesh_.cellBb(celli));
+                    treeBoundBox cellBb(mesh_.cells()[celli].box(mesh_));
 
                     if (geometry.overlaps(cellBb))
                     {
@@ -279,7 +279,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
             {
                 if (volumeStatus[celli] == volumeType::UNKNOWN)
                 {
-                    treeBoundBox cellBb(mesh_.cellBb(celli));
+                    treeBoundBox cellBb(mesh_.cells()[celli].box(mesh_));
 
                     if (geometry.overlaps(cellBb))
                     {
@@ -498,7 +498,7 @@ bool Foam::backgroundMeshDecomposition::refineCell
 
 //    const conformationSurfaces& geometry = geometryToConformTo_;
 
-    treeBoundBox cellBb(mesh_.cellBb(celli));
+    treeBoundBox cellBb(mesh_.cells()[celli].box(mesh_));
 
     weightEstimate = 1.0;
 
@@ -577,7 +577,7 @@ bool Foam::backgroundMeshDecomposition::refineCell
 //            // weightEstimate += sampleVol/pow3(s);
 //        }
 //
-//        if (sqr(spanScale_)*sqr(minCellSize) < cellBb.magSqr())
+//        if (sqr(spanScale_)*sqr(minCellSize) < magSqr(cellBb.span()))
 //        {
 //            return true;
 //        }
@@ -695,7 +695,7 @@ void Foam::backgroundMeshDecomposition::buildPatchAndTree()
     Pstream::allGatherList(allBackgroundMeshBounds_);
 
     // find global bounding box
-    globalBackgroundBounds_.reset();
+    globalBackgroundBounds_ = treeBoundBox(boundBox::invertedBox);
     forAll(allBackgroundMeshBounds_, proci)
     {
         globalBackgroundBounds_.add(allBackgroundMeshBounds_[proci]);
@@ -1119,7 +1119,10 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
 
         if (info.hit())
         {
-            distanceSqrToCandidate[tPI] = info.point().distSqr(testPoints[tPI]);
+            distanceSqrToCandidate[tPI] = magSqr
+            (
+                testPoints[tPI] - info.hitPoint()
+            );
         }
     }
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -132,7 +132,10 @@ Foam::word Foam::cellShapeControlMesh::meshSubDir = "cellShapeControlMesh";
 //
 //        if (spokeHit.hit())
 //        {
-//            scalar spokeHitDistance = spokeHit.point().dist(pt);
+//            scalar spokeHitDistance = mag
+//            (
+//                spokeHit.hitPoint() - pt
+//            );
 //
 //            if (spokeHitDistance < closestSpokeHitDistance)
 //            {
@@ -156,7 +159,10 @@ Foam::word Foam::cellShapeControlMesh::meshSubDir = "cellShapeControlMesh";
 //
 //        if (spokeHit.hit())
 //        {
-//            scalar spokeHitDistance = spokeHit.point().dist(mirrorPt);
+//            scalar spokeHitDistance = mag
+//            (
+//                spokeHit.hitPoint() - mirrorPt
+//            );
 //
 //            if (spokeHitDistance < closestSpokeHitDistance)
 //            {
@@ -196,10 +202,10 @@ Foam::word Foam::cellShapeControlMesh::meshSubDir = "cellShapeControlMesh";
 //        FatalErrorInFunction
 //            << "Parallel normals detected in spoke search." << nl
 //            << "point: " << pt << nl
-//            << "closest surface point: " << surfHit.point() << nl
-//            << "closest spoke hit: " << closestSpokeHit.point() << nl
-//            << "np: " << surfHit.point() + np << nl
-//            << "ns: " << closestSpokeHit.point() + na << nl
+//            << "closest surface point: " << surfHit.hitPoint() << nl
+//            << "closest spoke hit: " << closestSpokeHit.hitPoint() << nl
+//            << "np: " << surfHit.hitPoint() + np << nl
+//            << "ns: " << closestSpokeHit.hitPoint() + na << nl
 //            << exit(FatalError);
 //    }
 //

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -439,7 +439,7 @@ void Foam::searchableSurfaceControl::initialVertices
                 {
                     // Limit cell size
                     const vector vN =
-                        infoList[0].point()
+                        infoList[0].hitPoint()
                       - 2.0*normals[0]*defaultCellSize_;
 
                     List<pointIndexHit> intersectionList;
@@ -453,7 +453,8 @@ void Foam::searchableSurfaceControl::initialVertices
 
 //                if (intersectionList[0].hit())
 //                {
-//                    scalar dist = intersectionList[0].point().dist(pts[pI]);
+//                    scalar dist =
+//                        mag(intersectionList[0].hitPoint() - pts[pI]);
 //
 //                    limitedCellSize = dist/2.0;
 //                }

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2015 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -740,7 +739,7 @@ Foam::label Foam::controlMeshRefinement::refineMesh
 
         if (hitPt.hit())
         {
-            const Foam::point& pt = hitPt.point();
+            const Foam::point& pt = hitPt.hitPoint();
 
             if (!geometryToConformTo_.inside(pt))
             {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2015 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -155,10 +155,10 @@ bool Foam::linearDistance::cellSize(const point& pt, scalar& size) const
 
     if (hitInfo.hit())
     {
-        const point& hitPt = hitInfo.point();
+        const point& hitPt = hitInfo.hitPoint();
         const label hitIndex = hitInfo.index();
 
-        const scalar dist = hitPt.dist(pt);
+        const scalar dist = mag(pt - hitPt);
 
         if (sideMode_ == rmBothsides)
         {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2015 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -206,10 +206,10 @@ bool Foam::surfaceOffsetLinearDistance::cellSize
 
     if (hitInfo.hit())
     {
-        const point& hitPt = hitInfo.point();
+        const point& hitPt = hitInfo.hitPoint();
         const label hitIndex = hitInfo.index();
 
-        const scalar dist = hitPt.dist(pt);
+        const scalar dist = mag(pt - hitPt);
 
         if (sideMode_ == rmBothsides)
         {
@@ -220,7 +220,7 @@ bool Foam::surfaceOffsetLinearDistance::cellSize
 
         // If the nearest point is essentially on the surface, do not do a
         // getVolumeType calculation, as it will be prone to error.
-        if (hitInfo.point().dist(pt) < snapToSurfaceTol_)
+        if (mag(pt  - hitInfo.hitPoint()) < snapToSurfaceTol_)
         {
             size = sizeFunction(hitPt, 0, hitIndex);