From 8e8eb32cc4253165011f5f2efdd4cd64ca196343 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 25 Mar 2019 15:42:29 +0000
Subject: [PATCH 01/15] ENH: limitedSnGrad: added debug writing

---
 .../limitedSnGrad/limitedSnGrad.C             | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
index 4c6a014c25..d58c649626 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
@@ -30,6 +30,7 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "localMax.H"
+#include "fvcCellReduce.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -82,6 +83,40 @@ limitedSnGrad<Type>::correction
             << "limiter min: " << min(limiter.primitiveField())
             << " max: "<< max(limiter.primitiveField())
             << " avg: " << average(limiter.primitiveField()) << endl;
+
+
+        if (fv::debug & 2)
+        {
+            static scalar oldTime = -1;
+            static label subIter = 0;
+            if (vf.mesh().time().value() != oldTime)
+            {
+                oldTime = vf.mesh().time().value();
+                subIter = 0;
+            }
+            else
+            {
+                ++subIter;
+            }
+            word fieldName("limiter_" + Foam::name(subIter));
+
+            GeometricField<scalar, fvPatchField, volMesh> volLimiter
+            (
+                IOobject
+                (
+                    fieldName,
+                    vf.mesh().time().timeName(),
+                    vf.mesh(),
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                fvc::cellReduce(limiter, minEqOp<scalar>(), scalar(1.0))
+            );
+            Info<< "Writing limiter field to " << volLimiter.objectPath()
+                << endl;
+            volLimiter.write();
+        }
     }
 
     return limiter*corr;

From 40d771b3995d369ffeceaf7f8731709f7ce226f1 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 27 Mar 2019 10:39:35 +0000
Subject: [PATCH 02/15] ENH: extrudeMesh: -dict. See #1253

---
 .../extrude/extrudeMesh/extrudeMesh.C         | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 4313846826..a247fdb059 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -217,6 +217,7 @@ int main(int argc, char *argv[])
     );
 
     #include "addRegionOption.H"
+    argList::addOption("dict", "file", "Use alternative extrudeMeshDict");
     #include "setRootCase.H"
     #include "createTimeExtruded.H"
 
@@ -236,15 +237,19 @@ int main(int argc, char *argv[])
             << runTimeExtruded.timeName() << nl << endl;
     }
 
-
-    IOdictionary dict
+    const IOdictionary dict
     (
-        IOobject
+        IOobject::selectIO
         (
-            "extrudeMeshDict",
-            runTimeExtruded.system(),
-            runTimeExtruded,
-            IOobject::MUST_READ_IF_MODIFIED
+            IOobject
+            (
+                "extrudeMeshDict",
+                runTimeExtruded.system(),
+                runTimeExtruded,
+                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::NO_WRITE
+            ),
+            args.opt<fileName>("dict", "")
         )
     );
 

From 311581371f65998062d9a99c3e3039fed6800b7a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 27 Mar 2019 08:24:03 +0100
Subject: [PATCH 03/15] ENH: changed definition of complex::one (#1247)

- was historically defined as (1 1), but it is more consistent with
  the concept of one to have a real component only.

  Now defined as (1 0):  1+0i

STYLE: remove obscure '!' operator for complex conjugate

- either use the member function or the '~' operator
---
 applications/test/complex/Test-complex.C      |  5 ++---
 .../Vector/complexVector/complexVector.H      |  5 +++--
 .../Vector/complexVector/complexVectorI.H     | 15 ++++----------
 src/OpenFOAM/primitives/complex/complex.C     |  2 +-
 src/OpenFOAM/primitives/complex/complex.H     | 14 ++++++-------
 src/OpenFOAM/primitives/complex/complexI.H    | 20 ++++++++-----------
 6 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/applications/test/complex/Test-complex.C b/applications/test/complex/Test-complex.C
index 0cf31f9c85..7ee36a7d4a 100644
--- a/applications/test/complex/Test-complex.C
+++ b/applications/test/complex/Test-complex.C
@@ -56,11 +56,10 @@ int main(int argc, char *argv[])
         << "complexVector::one  : " << complexVector::one << nl
         << nl;
 
-    // Comparison
-
-    for (complex c :  { complex{1, 0}, complex{1, 2}} )
+    for (complex c : { complex{1, 0}, complex{1, 2}} )
     {
         print1(c);
+
         // TDB: allow implicit construct from scalar?
         //
         // if (c == 1.0)
diff --git a/src/OpenFOAM/primitives/Vector/complexVector/complexVector.H b/src/OpenFOAM/primitives/Vector/complexVector/complexVector.H
index 0fa238575e..fb36af3ad8 100644
--- a/src/OpenFOAM/primitives/Vector/complexVector/complexVector.H
+++ b/src/OpenFOAM/primitives/Vector/complexVector/complexVector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2010, 2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011 OpenFOAM Foundation
@@ -27,7 +27,7 @@ Typedef
     Foam::complexVector
 
 Description
-    complexVector obtained from generic Vector.
+    A Vector of complex values with 'scalar' precision.
 
 SourceFiles
     complexVectorI.H
@@ -48,6 +48,7 @@ namespace Foam
     typedef Vector<complex> complexVector;
 }
 
+// Functions
 #include "complexVectorI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H b/src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H
index 7e181669d1..175900b723 100644
--- a/src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H
+++ b/src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H
@@ -23,10 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    complexVector specific part of 3D complexVector obtained from
-    generic Vector.
-
 \*---------------------------------------------------------------------------*/
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -34,7 +30,7 @@ Description
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 inline complexVector operator*(const complex& v1, const complexVector& v2)
 {
@@ -80,8 +76,7 @@ inline complexVector operator/(const complex& v1, const complexVector& v2)
 }
 
 
-// complexVector dot product
-
+//- Dot product for complexVector
 inline complex operator&(const complexVector& v1, const complexVector& v2)
 {
     return complex
@@ -93,8 +88,7 @@ inline complex operator&(const complexVector& v1, const complexVector& v2)
 }
 
 
-// complexVector cross product
-
+//- Cross product for complexVector
 inline complexVector operator^(const complexVector& v1, const complexVector& v2)
 {
     return complexVector
@@ -106,8 +100,7 @@ inline complexVector operator^(const complexVector& v1, const complexVector& v2)
 }
 
 
-// complexVector cross product
-
+//- Cross product for complexVector
 inline complexVector operator^(const vector& v1, const complexVector& v2)
 {
     return complexVector
diff --git a/src/OpenFOAM/primitives/complex/complex.C b/src/OpenFOAM/primitives/complex/complex.C
index e53a04fe52..51bd1142fb 100644
--- a/src/OpenFOAM/primitives/complex/complex.C
+++ b/src/OpenFOAM/primitives/complex/complex.C
@@ -32,7 +32,7 @@ License
 
 const char* const Foam::complex::typeName = "complex";
 const Foam::complex Foam::complex::zero(0, 0);
-const Foam::complex Foam::complex::one(1, 1);
+const Foam::complex Foam::complex::one(1, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/complex/complex.H b/src/OpenFOAM/primitives/complex/complex.H
index 8c67134d80..7e9419af48 100644
--- a/src/OpenFOAM/primitives/complex/complex.H
+++ b/src/OpenFOAM/primitives/complex/complex.H
@@ -98,7 +98,7 @@ public:
         //- A complex zero (0,0)
         static const complex zero;
 
-        //- A complex one (1,1)
+        //- A complex one (1,0)
         static const complex one;
 
 
@@ -189,12 +189,6 @@ public:
         inline void operator*=(const scalar s);
         inline void operator/=(const scalar s);
 
-        //- Conjugate
-        inline complex operator~() const;
-
-        //- Conjugate
-        inline complex operator!() const;
-
         inline bool operator==(const complex& c) const;
         inline bool operator!=(const complex& c) const;
 
@@ -244,6 +238,12 @@ template<>
 inline bool contiguous<complex>() {return true;}
 
 
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+
+//- Complex conjugate
+inline complex operator~(const complex& c);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/complex/complexI.H b/src/OpenFOAM/primitives/complex/complexI.H
index 41bfa6befd..587eb6a0bd 100644
--- a/src/OpenFOAM/primitives/complex/complexI.H
+++ b/src/OpenFOAM/primitives/complex/complexI.H
@@ -174,18 +174,6 @@ inline void Foam::complex::operator/=(const scalar s)
 }
 
 
-inline Foam::complex Foam::complex::operator~() const
-{
-    return conjugate();
-}
-
-
-inline Foam::complex Foam::complex::operator!() const
-{
-    return conjugate();
-}
-
-
 inline bool Foam::complex::operator==(const complex& c) const
 {
     return (equal(re, c.re) && equal(im, c.im));
@@ -198,6 +186,14 @@ inline bool Foam::complex::operator!=(const complex& c) const
 }
 
 
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+
+inline Foam::complex Foam::operator~(const complex& c)
+{
+    return c.conjugate();
+}
+
+
 // * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
 
 

From 626c97cbeae364506d96aacff49fd7cd0f6aedaa Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 27 Mar 2019 08:46:10 +0100
Subject: [PATCH 04/15] STYLE: move bitSet '~' member operator to be a global
 operator instead

---
 src/OpenFOAM/containers/Bits/bitSet/bitSet.H  |  7 +++----
 src/OpenFOAM/containers/Bits/bitSet/bitSetI.H | 18 +++++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
index 2c5c283136..59429e7d70 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
@@ -513,10 +513,6 @@ public:
         //- Move assignment
         inline bitSet& operator=(bitSet&& bitset);
 
-        //- Complement operator.
-        //  Return a copy of the existing set with all its bits flipped.
-        inline bitSet operator~() const;
-
         //- Bitwise-AND all the bits in other with the bits in this bitset.
         //  The operands may have dissimilar sizes without affecting the size
         //  of the set.
@@ -576,6 +572,9 @@ Ostream& operator<<(Ostream& os, const bitSet& bitset);
 Ostream& operator<<(Ostream& os, const InfoProxy<bitSet>& info);
 
 
+//- Bitset complement, returns a copy of the bitset with all its bits flipped
+inline bitSet operator~(const bitSet& bitset);
+
 //- Bitwise-AND of two bitsets.
 //  See bitSet::operator&= for more details.
 inline bitSet operator&(const bitSet& a, const bitSet& b);
diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H b/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H
index afc7d93f97..5312caa3d1 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2018-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -663,14 +663,6 @@ inline Foam::bitSet& Foam::bitSet::operator=(bitSet&& bitset)
 }
 
 
-inline Foam::bitSet Foam::bitSet::operator~() const
-{
-    bitSet result(*this);
-    result.flip();
-    return result;
-}
-
-
 inline Foam::bitSet& Foam::bitSet::operator&=(const bitSet& other)
 {
     return andEq(other);
@@ -697,6 +689,14 @@ inline Foam::bitSet& Foam::bitSet::operator-=(const bitSet& other)
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
+inline Foam::bitSet Foam::operator~(const bitSet& bitset)
+{
+    bitSet result(bitset);
+    result.flip();
+    return result;
+}
+
+
 inline Foam::bitSet Foam::operator&(const bitSet& a, const bitSet& b)
 {
     bitSet result(a);

From 77076e5302272cc8b4dcd4e53512d4fdc4367f01 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 27 Mar 2019 09:04:13 +0100
Subject: [PATCH 05/15] STYLE: remove deprecated bitSet::used() method

- The 'used()' method was for transitional compatibility with the now
  defunct PackedBoolList.

  The canonical method name for returning a labelList of 'on' bits is
  toc().
---
 src/OpenFOAM/containers/Bits/bitSet/bitSet.H | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
index 59429e7d70..00d9430596 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
@@ -551,14 +551,6 @@ public:
         {
             return *this;
         }
-
-
-    // Housekeeping
-
-        //- Deprecated(2018-04) compatibility name for PackedBoolList
-        //  \deprecated(2018-04) - use toc() method
-        inline labelList used() const { return toc(); }
-
 };
 
 

From 729d8e41b73d9574ef9e551125577ae26e21617c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 27 Mar 2019 15:04:48 +0000
Subject: [PATCH 06/15] ENH: snappyHexMesh: allow cross-patch merging of patch
 faces. Fixes #1255.

---
 .../generation/snappyHexMesh/snappyHexMesh.C  | 48 ++++++++----
 .../polyTopoChange/combineFaces.C             | 77 ++++++++++++++++---
 .../polyTopoChange/combineFaces.H             | 21 +++--
 .../meshRefinement/meshRefinement.H           | 18 ++++-
 .../meshRefinement/meshRefinementMerge.C      | 14 ++--
 .../snappyHexMeshDriver/snappyLayerDriver.C   | 16 ++--
 .../snappyHexMeshDriver/snappyLayerDriver.H   |  6 +-
 .../snappyHexMeshDriver/snappyRefineDriver.C  | 18 +++--
 .../snappyHexMeshDriver/snappyRefineDriver.H  |  6 +-
 .../snappyHexMeshDriver/snappySnapDriver.C    | 11 ++-
 .../snappyHexMeshDriver/snappySnapDriver.H    |  3 +-
 11 files changed, 179 insertions(+), 59 deletions(-)

diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 5ac2aeb11d..d5381bc241 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011, 2015-2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011, 2015-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -1691,19 +1691,41 @@ int main(int argc, char *argv[])
     }
 
 
-    const bool mergePatchFaces
-    (
-        meshDict.lookupOrDefault("mergePatchFaces", true)
-    );
-
-    if (!mergePatchFaces)
+    // How to treat co-planar faces
+    meshRefinement::FaceMergeType mergeType =
+        meshRefinement::FaceMergeType::GEOMETRIC;
     {
-        Info<< "Not merging patch-faces of cell to preserve"
-            << " (split)hex cell shape."
-            << nl << endl;
+        const bool mergePatchFaces
+        (
+            meshDict.lookupOrDefault("mergePatchFaces", true)
+        );
+
+        if (!mergePatchFaces)
+        {
+            Info<< "Not merging patch-faces of cell to preserve"
+                << " (split)hex cell shape."
+                << nl << endl;
+            mergeType = meshRefinement::FaceMergeType::NONE;
+        }
+        else
+        {
+            const bool mergeAcrossPatches
+            (
+                meshDict.lookupOrDefault("mergeAcrossPatches", false)
+            );
+
+            if (mergeAcrossPatches)
+            {
+                Info<< "Merging co-planar patch-faces of cells"
+                    << ", regardless of patch assignment"
+                    << nl << endl;
+                mergeType = meshRefinement::FaceMergeType::IGNOREPATCH;
+            }
+        }
     }
 
 
+
     if (wantRefine)
     {
         cpuTime timer;
@@ -1732,7 +1754,7 @@ int main(int argc, char *argv[])
             refineParams,
             snapParams,
             refineParams.handleSnapProblems(),
-            mergePatchFaces,        // merge co-planar faces
+            mergeType,
             motionDict
         );
 
@@ -1784,7 +1806,7 @@ int main(int argc, char *argv[])
         (
             snapDict,
             motionDict,
-            mergePatchFaces,
+            mergeType,
             curvature,
             planarAngle,
             snapParams
@@ -1851,7 +1873,7 @@ int main(int argc, char *argv[])
             layerDict,
             motionDict,
             layerParams,
-            mergePatchFaces,
+            mergeType,
             preBalance,
             decomposer,
             distributor
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 9c47866bd4..8078b9ccfc 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -129,6 +129,7 @@ bool Foam::combineFaces::validFace
 void Foam::combineFaces::regioniseFaces
 (
     const scalar minCos,
+    const bool mergeAcrossPatches,
     const label celli,
     const labelList& cEdges,
     Map<label>& faceRegion
@@ -143,16 +144,31 @@ void Foam::combineFaces::regioniseFaces
         label f0, f1;
         meshTools::getEdgeFaces(mesh_, celli, edgeI, f0, f1);
 
+        const vector& a0 = mesh_.faceAreas()[f0];
+        const vector& a1 = mesh_.faceAreas()[f1];
+
         const label p0 = patches.whichPatch(f0);
         const label p1 = patches.whichPatch(f1);
 
         // Face can be merged if
-        // - same non-coupled patch
         // - small angle
-        if (p0 != -1 && p0 == p1 && !patches[p0].coupled())
+        // - mergeAcrossPatches=false : same non-coupled patch
+        // - mergeAcrossPatches=true  : always
+        if
+        (
+            p0 != -1
+         && p1 != -1
+         && !patches[p0].coupled()
+         && !patches[p1].coupled()
+        )
         {
-            const vector f0Normal = normalised(mesh_.faceAreas()[f0]);
-            const vector f1Normal = normalised(mesh_.faceAreas()[f1]);
+            if (!mergeAcrossPatches && (p0 != p1))
+            {
+                continue;
+            }
+
+            const vector f0Normal = normalised(a0);
+            const vector f1Normal = normalised(a1);
 
             if ((f0Normal & f1Normal) > minCos)
             {
@@ -285,7 +301,8 @@ Foam::labelListList Foam::combineFaces::getMergeSets
 (
     const scalar featureCos,
     const scalar minConcaveCos,
-    const labelHashSet& boundaryCells
+    const labelHashSet& boundaryCells,
+    const bool mergeAcrossPatches
 ) const
 {
     // Lists of faces that can be merged.
@@ -303,7 +320,14 @@ Foam::labelListList Foam::combineFaces::getMergeSets
 
         // Region per face
         Map<label> faceRegion(cFaces.size());
-        regioniseFaces(featureCos, celli, cEdges, faceRegion);
+        regioniseFaces
+        (
+            featureCos,
+            mergeAcrossPatches,
+            celli,
+            cEdges,
+            faceRegion
+        );
 
         // Now we have in faceRegion for every face the region with planar
         // face sharing the same region. We now check whether the resulting
@@ -338,7 +362,7 @@ Foam::labelListList Foam::combineFaces::getMergeSets
 
             // For every set check if it forms a valid convex face
 
-            forAllConstIters(regionToFaces, iter)
+            forAllIters(regionToFaces, iter)
             {
                 // Make face out of setFaces
                 indirectPrimitivePatch bigFace
@@ -354,7 +378,33 @@ Foam::labelListList Foam::combineFaces::getMergeSets
                 // Only store if -only one outside loop -which forms convex face
                 if (validFace(minConcaveCos, bigFace))
                 {
-                    allFaceSets.append(iter.val());
+                    labelList& faceIDs = iter.val();
+
+                    // For cross-patch merging we want to make the
+                    // largest face the one to decide the final patch
+                    // (i.e. master face)
+                    if (mergeAcrossPatches)
+                    {
+                        const vectorField& areas = mesh_.faceAreas();
+
+                        label maxIndex = 0;
+                        scalar maxMagSqr = magSqr(areas[faceIDs[0]]);
+                        for (label i = 1; i < faceIDs.size(); ++i)
+                        {
+                            const scalar a2 = magSqr(areas[faceIDs[i]]);
+                            if (a2 > maxMagSqr)
+                            {
+                                maxMagSqr = a2;
+                                maxIndex = i;
+                            }
+                        }
+                        if (maxIndex != 0)
+                        {
+                            Swap(faceIDs[0], faceIDs[maxIndex]);
+                        }
+                    }
+
+                    allFaceSets.append(faceIDs);
                 }
             }
         }
@@ -367,7 +417,8 @@ Foam::labelListList Foam::combineFaces::getMergeSets
 Foam::labelListList Foam::combineFaces::getMergeSets
 (
     const scalar featureCos,
-    const scalar minConcaveCos
+    const scalar minConcaveCos,
+    const bool mergeAcrossPatches
 ) const
 {
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
@@ -388,7 +439,13 @@ Foam::labelListList Foam::combineFaces::getMergeSets
         }
     }
 
-    return getMergeSets(featureCos, minConcaveCos, boundaryCells);
+    return getMergeSets
+    (
+        featureCos,
+        minConcaveCos,
+        boundaryCells,
+        mergeAcrossPatches
+    );
 }
 
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
index e70f8096e6..0ebd717f17 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2010,2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -103,6 +103,7 @@ class combineFaces
         void regioniseFaces
         (
             const scalar minCos,
+            const bool mergeAcrossPatches,
             const label celli,
             const labelList& cEdges,
             Map<label>& faceRegion
@@ -155,20 +156,27 @@ public:
         // Helper functions
 
             //- Extract lists of all (non-coupled) boundary faces on selected
-            //  cells that can be merged. Uses getFaceRegions.
+            //  cells that can be merged. Uses getFaceRegions. Optionally
+            //  allow faces-on-different-patches to be merged (into the largest
+            //  area face - could be improved). Note: causes a problem in
+            //  undoing - all restored faces get the patch/zone from the
+            //  master face.
             labelListList getMergeSets
             (
                 const scalar featureCos,
                 const scalar minConcaveCos,
-                const labelHashSet& boundaryCells
+                const labelHashSet& boundaryCells,
+                const bool mergeAcrossPatches = false
             ) const;
 
             //- Extract lists of all (non-coupled) boundary faces that can
-            //  be merged. Uses getFaceRegions.
+            //  be merged. Uses getFaceRegions. See note above about
+            //  mergeAcrossPatches.
             labelListList getMergeSets
             (
                 const scalar featureCos,
-                const scalar minConcaveCos
+                const scalar minConcaveCos,
+                const bool mergeAcrossPatches = false
             ) const;
 
             //- Gets outside of patch as a face (in mesh point labels)
@@ -197,7 +205,8 @@ public:
             //  Returns maps from added restored point to
             //  original point label (i.e. content of savedPointLabels_).
             //  (only restoredPoints are actually set; rest are just for
-            //   generalness)
+            //   generalness). See note above about restoring faces from
+            //  different patches (mergeAcrossPatches)
             void setUnrefinement
             (
                 const labelList& masterFaces,
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index 38980d1e45..e9316e9323 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011, 2015-2019 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011, 2015-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -129,6 +129,16 @@ public:
             REMOVE = 4      //!< set value to -1 any face that was refined
         };
 
+        //- Enumeration for what to do with co-planar patch faces on a single
+        //  cell
+        enum FaceMergeType
+        {
+            NONE,           // no merging
+            GEOMETRIC,      // use feature angle
+            IGNOREPATCH     // use feature angle, allow merging of different
+                            // patches
+        };
+
 
 private:
 
@@ -1463,7 +1473,8 @@ public:
                     const scalar minCos,
                     const scalar concaveCos,
                     const label mergeSize,
-                    const labelList& patchIDs
+                    const labelList& patchIDs,
+                    const meshRefinement::FaceMergeType mergeType
                 );
 
                 //- Merge coplanar faces. preserveFaces is != -1 for faces
@@ -1474,7 +1485,8 @@ public:
                     const scalar concaveCos,
                     const labelList& patchIDs,
                     const dictionary& motionDict,
-                    const labelList& preserveFaces
+                    const labelList& preserveFaces,
+                    const meshRefinement::FaceMergeType mergeType
                 );
 
                 autoPtr<mapPolyMesh> doRemovePoints
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
index 7445c41014..9852a7f950 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011, 2016-2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011, 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2014 OpenFOAM Foundation
@@ -42,7 +42,8 @@ Foam::label Foam::meshRefinement::mergePatchFaces
     const scalar minCos,
     const scalar concaveCos,
     const label mergeSize,
-    const labelList& patchIDs
+    const labelList& patchIDs,
+    const meshRefinement::FaceMergeType mergeType
 )
 {
     // Patch face merging engine
@@ -73,7 +74,8 @@ Foam::label Foam::meshRefinement::mergePatchFaces
         (
             minCos,
             concaveCos,
-            boundaryCells
+            boundaryCells,
+            (mergeType == FaceMergeType::IGNOREPATCH) // merge across patches?
         )
     );
 
@@ -249,7 +251,8 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
     const scalar concaveCos,
     const labelList& patchIDs,
     const dictionary& motionDict,
-    const labelList& preserveFaces
+    const labelList& preserveFaces,
+    const meshRefinement::FaceMergeType mergeType
 )
 {
     // Patch face merging engine
@@ -286,7 +289,8 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
         (
             minCos,
             concaveCos,
-            boundaryCells
+            boundaryCells,
+            (mergeType == FaceMergeType::IGNOREPATCH) // merge across patches?
         )
     );
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index e67f69fd58..6518115a13 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -3219,7 +3219,8 @@ Foam::snappyLayerDriver::snappyLayerDriver
 void Foam::snappyLayerDriver::mergePatchFacesUndo
 (
     const layerParameters& layerParams,
-    const dictionary& motionDict
+    const dictionary& motionDict,
+    const meshRefinement::FaceMergeType mergeType
 )
 {
     // Clip to 30 degrees. Not helpful!
@@ -3260,7 +3261,8 @@ void Foam::snappyLayerDriver::mergePatchFacesUndo
         concaveCos,
         meshRefiner_.meshedPatches(),
         motionDict,
-        duplicateFace
+        duplicateFace,
+        mergeType   // How to merge co-planar patch faces
     );
 
     nChanged += meshRefiner_.mergeEdgesUndo(minCos, motionDict);
@@ -4635,7 +4637,7 @@ void Foam::snappyLayerDriver::doLayers
     const dictionary& shrinkDict,
     const dictionary& motionDict,
     const layerParameters& layerParams,
-    const bool mergePatchFaces,
+    const meshRefinement::FaceMergeType mergeType,
     const bool preBalance,
     decompositionMethod& decomposer,
     fvMeshDistribute& distributor
@@ -4653,9 +4655,13 @@ void Foam::snappyLayerDriver::doLayers
     Info<< "Using mesh parameters " << motionDict << nl << endl;
 
     // Merge coplanar boundary faces
-    if (mergePatchFaces)
+    if
+    (
+        mergeType == meshRefinement::FaceMergeType::GEOMETRIC
+     || mergeType == meshRefinement::FaceMergeType::IGNOREPATCH
+    )
     {
-        mergePatchFacesUndo(layerParams, motionDict);
+        mergePatchFacesUndo(layerParams, motionDict, mergeType);
     }
 
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
index db8af3985a..231837ab5f 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
@@ -634,7 +634,8 @@ public:
             void mergePatchFacesUndo
             (
                 const layerParameters& layerParams,
-                const dictionary& motionDict
+                const dictionary& motionDict,
+                const meshRefinement::FaceMergeType mergeType
             );
 
             //- Add cell layers
@@ -654,12 +655,11 @@ public:
                 const dictionary& shrinkDict,
                 const dictionary& motionDict,
                 const layerParameters& layerParams,
-                const bool mergePatchFaces,         // merging patch faces
+                const meshRefinement::FaceMergeType mergeType,
                 const bool preBalance,              // balance before adding?
                 decompositionMethod& decomposer,
                 fvMeshDistribute& distributor
             );
-
 };
 
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index 75ba0a0f15..cde402e872 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -2794,7 +2794,7 @@ void Foam::snappyRefineDriver::addFaceZones
 
 void Foam::snappyRefineDriver::mergePatchFaces
 (
-    const bool geometricMerge,
+    const meshRefinement::FaceMergeType mergeType,
     const refinementParameters& refineParams,
     const dictionary& motionDict
 )
@@ -2812,7 +2812,11 @@ void Foam::snappyRefineDriver::mergePatchFaces
 
     const fvMesh& mesh = meshRefiner_.mesh();
 
-    if (geometricMerge)
+    if
+    (
+        mergeType == meshRefinement::FaceMergeType::GEOMETRIC
+     || mergeType == meshRefinement::FaceMergeType::IGNOREPATCH
+    )
     {
         meshRefiner_.mergePatchFacesUndo
         (
@@ -2820,7 +2824,8 @@ void Foam::snappyRefineDriver::mergePatchFaces
             Foam::cos(degToRad(45.0)),
             meshRefiner_.meshedPatches(),
             motionDict,
-            labelList(mesh.nFaces(), -1)
+            labelList(mesh.nFaces(), -1),
+            mergeType
         );
     }
     else
@@ -2831,7 +2836,8 @@ void Foam::snappyRefineDriver::mergePatchFaces
             Foam::cos(degToRad(45.0)),
             Foam::cos(degToRad(45.0)),
             4,          // only merge faces split into 4
-            meshRefiner_.meshedPatches()
+            meshRefiner_.meshedPatches(),
+            meshRefinement::FaceMergeType::GEOMETRIC // no merge across patches
         );
     }
 
@@ -2855,7 +2861,7 @@ void Foam::snappyRefineDriver::doRefine
     const refinementParameters& refineParams,
     const snapParameters& snapParams,
     const bool prepareForSnapping,
-    const bool doMergePatchFaces,
+    const meshRefinement::FaceMergeType mergeType,
     const dictionary& motionDict
 )
 {
@@ -3063,7 +3069,7 @@ void Foam::snappyRefineDriver::doRefine
     // Do something about cells with refined faces on the boundary
     if (prepareForSnapping)
     {
-        mergePatchFaces(doMergePatchFaces, refineParams, motionDict);
+        mergePatchFaces(mergeType, refineParams, motionDict);
     }
 
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H
index eeec7ed89a..da43baf51f 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H
@@ -43,6 +43,7 @@ SourceFiles
 #include "writer.H"
 #include "DynamicList.H"
 #include "labelVector.H"
+#include "meshRefinement.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,7 +54,6 @@ namespace Foam
 class refinementParameters;
 class snapParameters;
 
-class meshRefinement;
 class decompositionMethod;
 class fvMeshDistribute;
 class fvMesh;
@@ -226,7 +226,7 @@ class snappyRefineDriver
         //- Merge refined boundary faces (from exposing coarser cell)
         void mergePatchFaces
         (
-            const bool geometricMerge,
+            const meshRefinement::FaceMergeType mergeType,
             const refinementParameters& refineParams,
             const dictionary& motionDict
         );
@@ -268,7 +268,7 @@ public:
             const refinementParameters& refineParams,
             const snapParameters& snapParams,
             const bool prepareForSnapping,
-            const bool mergePatchFaces,
+            const meshRefinement::FaceMergeType mergeType,
             const dictionary& motionDict
         );
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index a30549e765..7f2ff128e8 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -2528,7 +2528,7 @@ void Foam::snappySnapDriver::doSnap
 (
     const dictionary& snapDict,
     const dictionary& motionDict,
-    const bool mergePatchFaces,
+    const meshRefinement::FaceMergeType mergeType,
     const scalar featureCos,
     const scalar planarAngle,
     const snapParameters& snapParams
@@ -3031,7 +3031,11 @@ void Foam::snappySnapDriver::doSnap
         repatchToSurface(snapParams, adaptPatchIDs, duplicateFace);
     }
 
-    if (mergePatchFaces)
+    if
+    (
+        mergeType == meshRefinement::FaceMergeType::GEOMETRIC
+     || mergeType == meshRefinement::FaceMergeType::IGNOREPATCH
+    )
     {
         labelList duplicateFace(getInternalOrBaffleDuplicateFace());
 
@@ -3044,7 +3048,8 @@ void Foam::snappySnapDriver::doSnap
             featureCos,     // concaveCos
             meshRefiner_.meshedPatches(),
             motionDict,
-            duplicateFace   // faces not to merge
+            duplicateFace,  // faces not to merge
+            mergeType
         );
 
         nChanged += meshRefiner_.mergeEdgesUndo(featureCos, motionDict);
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
index c1175df7c0..c459a2b474 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
@@ -781,12 +781,11 @@ public:
             (
                 const dictionary& snapDict,
                 const dictionary& motionDict,
-                const bool mergePatchFaces,
+                const meshRefinement::FaceMergeType mergeType,
                 const scalar featureCos,
                 const scalar planarAngle,
                 const snapParameters& snapParams
             );
-
 };
 
 

From 12f2e7e1548c29a4991ceb0c944e1811659b2712 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 27 Mar 2019 16:29:52 +0000
Subject: [PATCH 07/15] BUG: PBiCGStab: check minIter. Fixes #1052.

---
 .../matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C
index adf8b3054a..1e343565fb 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C
@@ -208,7 +208,11 @@ Foam::solverPerformance Foam::PBiCGStab::solve
             solverPerf.finalResidual() =
                 gSumMag(sA, matrix().mesh().comm())/normFactor;
 
-            if (solverPerf.checkConvergence(tolerance_, relTol_))
+            if
+            (
+                solverPerf.nIterations() >= minIter_
+             && solverPerf.checkConvergence(tolerance_, relTol_)
+            )
             {
                 for (label cell=0; cell<nCells; cell++)
                 {

From 9236af25e690dce4d6b7d9d5ce521bfa7eaee07e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 28 Mar 2019 15:17:13 +0000
Subject: [PATCH 08/15] ENH: overset: move to oversetInterpolationSuppressed.
 Part of #1041.

---
 .../overLaplacianDyMFoam/createFields.H       | 17 -----------------
 .../overPotentialFoam/createFields.H          | 19 ++++++-------------
 .../heatTransfer/system/fvSchemes             |  8 ++++++--
 .../cylinderAndBackground/system/fvSchemes    |  1 -
 4 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/createFields.H b/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/createFields.H
index fc66a21b16..62036fcc76 100644
--- a/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/createFields.H
+++ b/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/createFields.H
@@ -13,23 +13,6 @@
         mesh
     );
 
-    // Add overset specific interpolations
-    {
-        dictionary oversetDict;
-        oversetDict.add("T", true);
-
-        const_cast<dictionary&>
-        (
-            mesh.schemesDict()
-        ).add
-        (
-            "oversetInterpolationRequired",
-            oversetDict,
-            true
-        );
-    }
-
-
     Info<< "Reading transportProperties\n" << endl;
 
     IOdictionary transportProperties
diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
index 80f04a8a68..d39f3044b7 100644
--- a/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
@@ -121,21 +121,14 @@ mesh.setFluxRequired(Phi.name());
 
 #include "createMRF.H"
 
-// Add overset specific interpolations
+// Add solver-specific interpolations
 {
-    dictionary oversetDict;
-    oversetDict.add("Phi", true);
-    oversetDict.add("U", true);
+    wordHashSet& nonInt =
+        const_cast<wordHashSet&>(Stencil::New(mesh).nonInterpolatedFields());
+
+    nonInt.insert("cellMask");
+    nonInt.insert("interpolatedCells");
 
-    const_cast<dictionary&>
-    (
-        mesh.schemesDict()
-    ).add
-    (
-        "oversetInterpolationRequired",
-        oversetDict,
-        true
-    );
 }
 
 // Mask field for zeroing out contributions on hole cells
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes
index aaf2392bd1..ac3a013d5e 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes
@@ -74,9 +74,13 @@ oversetInterpolation
     //searchBoxDivisions  (100 100 1);
 }
 
-oversetInterpolationRequired
+
+// Any additional fields that should not be interpolated
+oversetInterpolationSuppresed
 {
-    // Any additional fields that require overset interpolation
+    // For backwards compatibility; should not really be suppressed
+    grad(T);
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes
index e25ea6f5fc..7a4160973b 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes
@@ -53,5 +53,4 @@ oversetInterpolation
 }
 
 
-
 // ************************************************************************* //

From 1aaa4e3ed2712f1fb2f3ac3679b714e70ed324b6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 27 Mar 2019 14:43:44 +0100
Subject: [PATCH 09/15] ENH: add min/max method to PDRblock::location (#1216)

- grid(i,j,k) method for returning the grid point at an i-j-k location
---
 src/mesh/blockMesh/PDRblockMesh/PDRblock.H  | 12 +++++++
 src/mesh/blockMesh/PDRblockMesh/PDRblockI.H | 35 +++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblock.H b/src/mesh/blockMesh/PDRblockMesh/PDRblock.H
index 91e16b66e2..5f85f21ca9 100644
--- a/src/mesh/blockMesh/PDRblockMesh/PDRblock.H
+++ b/src/mesh/blockMesh/PDRblockMesh/PDRblock.H
@@ -110,6 +110,12 @@ public:
             //- True if the location is within the range
             inline bool contains(const scalar p) const;
 
+            //- The first() value is considered the min value.
+            inline const scalar& min() const;
+
+            //- The last() value is considered the max value.
+            inline const scalar& max() const;
+
             //- Mid-point location, zero for an empty list.
             inline scalar centre() const;
 
@@ -305,6 +311,12 @@ public:
         //- Cell dimensions at i,j,k position.
         inline vector span(const labelVector& ijk) const;
 
+        //- Grid point at i,j,k position.
+        inline point grid(const label i, const label j, const label k) const;
+
+        //- Grid point at i,j,k position.
+        inline point grid(const labelVector& ijk) const;
+
         //- Cell centre at i,j,k position.
         inline point C(const label i, const label j, const label k) const;
 
diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblockI.H b/src/mesh/blockMesh/PDRblockMesh/PDRblockI.H
index a624ee68a6..7a04ce09ea 100644
--- a/src/mesh/blockMesh/PDRblockMesh/PDRblockI.H
+++ b/src/mesh/blockMesh/PDRblockMesh/PDRblockI.H
@@ -62,6 +62,18 @@ inline bool Foam::PDRblock::location::contains(const scalar p) const
 }
 
 
+inline const Foam::scalar& Foam::PDRblock::location::min() const
+{
+    return scalarList::empty() ? pTraits<scalar>::rootMax : first();
+}
+
+
+inline const Foam::scalar& Foam::PDRblock::location::max() const
+{
+    return scalarList::empty() ? pTraits<scalar>::rootMin : last();
+}
+
+
 inline Foam::scalar Foam::PDRblock::location::centre() const
 {
     return scalarList::empty() ? 0 : (0.5*first() + 0.5*last());
@@ -206,6 +218,29 @@ inline Foam::vector Foam::PDRblock::span(const labelVector& ijk) const
 }
 
 
+inline Foam::point Foam::PDRblock::grid
+(
+    const label i,
+    const label j,
+    const label k
+) const
+{
+    return point(grid_.x()[i], grid_.y()[j], grid_.z()[k]);
+}
+
+
+inline Foam::point Foam::PDRblock::grid(const labelVector& ijk) const
+{
+    return
+        point
+        (
+            grid_.x()[ijk.x()],
+            grid_.y()[ijk.y()],
+            grid_.z()[ijk.z()]
+        );
+}
+
+
 inline Foam::point Foam::PDRblock::C
 (
     const label i,

From 894f14e1d51f8a667c69a6b12c0b14e19baae3bb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 29 Mar 2019 11:03:48 +0100
Subject: [PATCH 10/15] ENH: conversion and function improvements for complex
 (#1247)

- add construction from and conversion to std::complex, which allows
  easier wrapping of functions

- add Foam:: functions for complex versions of sin, cos, ...
---
 applications/test/complex/Test-complex.C   |  23 ++++-
 src/OpenFOAM/primitives/complex/complex.C  |  11 ++-
 src/OpenFOAM/primitives/complex/complex.H  |  39 ++++----
 src/OpenFOAM/primitives/complex/complexI.H | 105 ++++++++++++++++++++-
 4 files changed, 154 insertions(+), 24 deletions(-)

diff --git a/applications/test/complex/Test-complex.C b/applications/test/complex/Test-complex.C
index 7ee36a7d4a..3c9ef77384 100644
--- a/applications/test/complex/Test-complex.C
+++ b/applications/test/complex/Test-complex.C
@@ -25,12 +25,13 @@ Application
 
 Description
     Some tests for complex numbers
+
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
 #include "complex.H"
 #include "complexVector.H"
-#include "Field.H"
+#include "complexFields.H"
 
 using namespace Foam;
 
@@ -52,14 +53,26 @@ int main(int argc, char *argv[])
         << "complex(scalar) : " << complex(3.14519) << nl
         << nl;
 
+    std::complex<scalar> c1(10, -3);
+    Info<< "std::complex : " << c1 << nl;
+    Info<< "sin: " << std::sin(c1) << nl;
+
+
     Info<< "complexVector::zero : " << complexVector::zero << nl
         << "complexVector::one  : " << complexVector::one << nl
         << nl;
 
     for (complex c : { complex{1, 0}, complex{1, 2}} )
     {
+        Info<< nl;
         print1(c);
 
+        Info<< "sin: " << sin(c) << nl;
+        Info<< "pow(3): " << pow(c, 3) << nl;
+        Info<< "pow3: " << pow3(c) << nl;
+        Info<< "log: " << log(c) << nl;
+        Info<< "pow025: " << pow025(c) << nl;
+
         // TDB: allow implicit construct from scalar?
         //
         // if (c == 1.0)
@@ -68,7 +81,7 @@ int main(int argc, char *argv[])
         // }
     }
 
-    Field<complex> fld1(3, complex(2.0, 1.0));
+    complexField fld1(3, complex(2.0, 1.0));
 
     Info<< "Field " << flatOutput(fld1) << nl;
 
@@ -78,6 +91,12 @@ int main(int argc, char *argv[])
     fld1 *= 10;
     Info<< "Multiply: " << flatOutput(fld1) << nl;
 
+    // Not yet:
+    // #ifdef TEST_FOAM_OVERLOAD
+    // Info<< "sin: " << sin(fld1) << nl;
+    // #endif
+
+
     for (complex& c : fld1)
     {
         c = ~c;
diff --git a/src/OpenFOAM/primitives/complex/complex.C b/src/OpenFOAM/primitives/complex/complex.C
index 51bd1142fb..2afbfe8612 100644
--- a/src/OpenFOAM/primitives/complex/complex.C
+++ b/src/OpenFOAM/primitives/complex/complex.C
@@ -55,12 +55,15 @@ Foam::word Foam::name(const complex& c)
 
 Foam::Istream& Foam::operator>>(Istream& is, complex& c)
 {
+    scalar r, i;
+
     is.readBegin("complex");
-
-    is  >> c.re >> c.im;
-
+    is >> r >> i;
     is.readEnd("complex");
 
+    c.real(r);
+    c.imag(i);
+
     is.check(FUNCTION_NAME);
     return is;
 }
@@ -69,7 +72,7 @@ Foam::Istream& Foam::operator>>(Istream& is, complex& c)
 Foam::Ostream& Foam::operator<<(Ostream& os, const complex& c)
 {
     os  << token::BEGIN_LIST
-        << c.re << token::SPACE << c.im
+        << c.real() << token::SPACE << c.imag()
         << token::END_LIST;
 
     return os;
diff --git a/src/OpenFOAM/primitives/complex/complex.H b/src/OpenFOAM/primitives/complex/complex.H
index 7e9419af48..aa7dee6c70 100644
--- a/src/OpenFOAM/primitives/complex/complex.H
+++ b/src/OpenFOAM/primitives/complex/complex.H
@@ -38,6 +38,7 @@ SourceFiles
 #ifndef complex_H
 #define complex_H
 
+#include <complex>
 #include "scalar.H"
 #include "word.H"
 #include "zero.H"
@@ -68,9 +69,6 @@ inline complex operator*(const complex&, const scalar);
 inline complex operator/(const complex&, const scalar);
 inline complex operator/(const scalar, const complex&);
 
-Istream& operator>>(Istream& is, complex& c);
-Ostream& operator<<(Ostream& os, const complex& c);
-
 
 /*---------------------------------------------------------------------------*\
                            Class complex Declaration
@@ -119,6 +117,12 @@ public:
         //- Construct from real and imaginary parts
         inline constexpr complex(const scalar r, const scalar i) noexcept;
 
+        //- Construct from std::complex
+        inline complex(const std::complex<float>& c);
+
+        //- Construct from std::complex
+        inline complex(const std::complex<double>& c);
+
         //- Construct from Istream
         explicit complex(Istream& is);
 
@@ -172,6 +176,13 @@ public:
 
     // Member Operators
 
+        //- Conversion to std::complex
+        inline operator std::complex<scalar>() const
+        {
+            return std::complex<scalar>(re, im);
+        }
+
+
         //- Copy assignment
         inline void operator=(const complex& c);
 
@@ -218,17 +229,19 @@ public:
         friend complex operator*(const complex& c, const scalar s);
         friend complex operator/(const complex& c, const scalar s);
         friend complex operator/(const scalar s, const complex& c);
-
-
-    // IOstream Operators
-
-        friend Istream& operator>>(Istream& is, complex& c);
-        friend Ostream& operator<<(Ostream& os, const complex& c);
 };
 
 
-// * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
+Istream& operator>>(Istream& is, complex& c);
+Ostream& operator<<(Ostream& os, const complex& c);
+
+//- Complex conjugate
+inline complex operator~(const complex& c);
+
+
+// * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
 
 //- Return string representation of complex
 word name(const complex& c);
@@ -238,12 +251,6 @@ template<>
 inline bool contiguous<complex>() {return true;}
 
 
-// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
-
-//- Complex conjugate
-inline complex operator~(const complex& c);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/complex/complexI.H b/src/OpenFOAM/primitives/complex/complexI.H
index 587eb6a0bd..58e564e5fb 100644
--- a/src/OpenFOAM/primitives/complex/complexI.H
+++ b/src/OpenFOAM/primitives/complex/complexI.H
@@ -55,6 +55,20 @@ inline constexpr Foam::complex::complex(const scalar r, const scalar i) noexcept
 {}
 
 
+inline Foam::complex::complex(const std::complex<float>& c)
+:
+    re(c.real()),
+    im(c.imag())
+{}
+
+
+inline Foam::complex::complex(const std::complex<double>& c)
+:
+    re(c.real()),
+    im(c.imag())
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 inline void Foam::complex::real(scalar val)
@@ -196,7 +210,6 @@ inline Foam::complex Foam::operator~(const complex& c)
 
 // * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
 
-
 namespace Foam
 {
 
@@ -337,9 +350,97 @@ inline complex operator/(const scalar s, const complex& c)
     return complex(s/c.re, s/c.im);
 }
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Complex transcendental functions
+namespace Foam
+{
+    #define transFunc(func)                                                   \
+    inline complex func(const Foam::complex& z)                               \
+    {                                                                         \
+        return std:: func (std::complex<scalar>(z));                          \
+    }
+
+transFunc(sqrt)
+transFunc(exp)
+transFunc(log)
+transFunc(log10)
+transFunc(sin)
+transFunc(cos)
+transFunc(tan)
+transFunc(asin)
+transFunc(acos)
+transFunc(atan)
+transFunc(sinh)
+transFunc(cosh)
+transFunc(tanh)
+transFunc(asinh)
+transFunc(acosh)
+transFunc(atanh)
+
+// Special treatment for pow()
+inline complex pow(const complex& x, const complex& y)
+{
+    return std::pow(std::complex<scalar>(x), std::complex<scalar>(y));
+}
+
+
+// Combinations of complex and real
+#define powFuncs(type2)                                                       \
+    inline complex pow(const complex& x, const type2& y)                      \
+    {                                                                         \
+        return std::pow(std::complex<scalar>(x), scalar(y));                  \
+    }                                                                         \
+                                                                              \
+    inline Foam::complex pow(const type2& x, const complex& y)                \
+    {                                                                         \
+        return std::pow(scalar(x), std::complex<scalar>(y));                  \
+    }
+
+
+powFuncs(float)
+powFuncs(double)
+powFuncs(int)
+powFuncs(long)
+
+
+inline complex pow3(const complex& c)
+{
+    return c*sqr(c);
+}
+
+
+inline complex pow4(const complex& c)
+{
+    return sqr(sqr(c));
+}
+
+
+inline complex pow5(const complex& c)
+{
+    return c*pow4(c);
+}
+
+
+inline complex pow6(const complex& c)
+{
+    return pow3(sqr(c));
+}
+
+
+inline complex pow025(const complex& c)
+{
+    return sqrt(sqrt(c));
+}
+
+} // End namespace Foam
+
+#undef transFunc
+#undef powFuncs
+
 // ************************************************************************* //

From 3c0dac5209f3cbac491ae4eba569c1e12effcf98 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 29 Mar 2019 11:57:02 +0100
Subject: [PATCH 11/15] ENH: add some function support for complexField (#1247)

- operators are still incomplete, as are dimensioned fields,
  field-fields etc.

- split complexFields into separate complexField, complexVectorField files
---
 applications/test/complex/Test-complex.C      |  40 ++-
 src/OpenFOAM/Make/files                       |   3 +-
 .../fields/Fields/complex/complexField.C      | 168 ++++++++++++
 .../fields/Fields/complex/complexField.H      | 114 ++++++++
 .../fields/Fields/complex/complexFields.H     |  44 ++++
 .../Fields/complex/complexVectorField.C       | 156 +++++++++++
 .../complexVectorField.H}                     |  60 ++---
 .../Fields/complexFields/complexFields.C      | 248 ------------------
 8 files changed, 541 insertions(+), 292 deletions(-)
 create mode 100644 src/OpenFOAM/fields/Fields/complex/complexField.C
 create mode 100644 src/OpenFOAM/fields/Fields/complex/complexField.H
 create mode 100644 src/OpenFOAM/fields/Fields/complex/complexFields.H
 create mode 100644 src/OpenFOAM/fields/Fields/complex/complexVectorField.C
 rename src/OpenFOAM/fields/Fields/{complexFields/complexFields.H => complex/complexVectorField.H} (64%)
 delete mode 100644 src/OpenFOAM/fields/Fields/complexFields/complexFields.C

diff --git a/applications/test/complex/Test-complex.C b/applications/test/complex/Test-complex.C
index 3c9ef77384..bc4d3d05dc 100644
--- a/applications/test/complex/Test-complex.C
+++ b/applications/test/complex/Test-complex.C
@@ -29,8 +29,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "complex.H"
-#include "complexVector.H"
 #include "complexFields.H"
 
 using namespace Foam;
@@ -82,27 +80,45 @@ int main(int argc, char *argv[])
     }
 
     complexField fld1(3, complex(2.0, 1.0));
+    complexField fld2(fld1);
+
+    for (complex& c : fld2)
+    {
+        c = ~c;
+    }
 
     Info<< "Field " << flatOutput(fld1) << nl;
+    Info<< "Conjugate: " << flatOutput(fld2) << nl;
+
+    // Some arbitrary change
+    for (complex& c : fld2)
+    {
+        c.Im() *= 5;
+    }
+
 
     Info<< "sum = " << sum(fld1) << nl;
     // Not yet Info<< "min = " << min(fld1) << nl;
 
     fld1 *= 10;
-    Info<< "Multiply: " << flatOutput(fld1) << nl;
+    Info<< "scalar multiply: " << flatOutput(fld1) << nl;
 
-    // Not yet:
-    // #ifdef TEST_FOAM_OVERLOAD
-    // Info<< "sin: " << sin(fld1) << nl;
-    // #endif
+    fld1 /= 10;
+    Info<< "scalar divide: " << flatOutput(fld1) << nl;
 
+    Info<< "sin: " << sin(fld1) << nl;
 
-    for (complex& c : fld1)
-    {
-        c = ~c;
-    }
+    Info<< "operator + : " << (fld1 + fld2) << nl;
+
+    // Some operators are still incomplete
+
+    // Info<< "operator * : " << (fld1 * fld2) << nl;
+    // Info<< "operator / : " << (fld1 / fld2) << nl;
+    Info<< "operator / : " << (fld1 / 2) << nl;
+    // Info<< "operator / : " << (fld1 / fld2) << nl;
+    Info<< "sqrt   : " << sqrt(fld1) << nl;
+    // Info<< "pow(2) : " << pow(fld1, 2) << nl;
 
-    Info<< "Conjugate: " << flatOutput(fld1) << nl;
 
     Info<< "\nEnd\n" << endl;
     return 0;
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 54c3b2a19a..b3c9ecfdcc 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -672,7 +672,8 @@ $(Fields)/quaternionField/quaternionField.C
 $(Fields)/quaternionField/quaternionIOField.C
 $(Fields)/triadField/triadField.C
 $(Fields)/triadField/triadIOField.C
-$(Fields)/complexFields/complexFields.C
+$(Fields)/complex/complexField.C
+$(Fields)/complex/complexVectorField.C
 $(Fields)/transformField/transformField.C
 $(Fields)/fieldTypes.C
 
diff --git a/src/OpenFOAM/fields/Fields/complex/complexField.C b/src/OpenFOAM/fields/Fields/complex/complexField.C
new file mode 100644
index 0000000000..5662ab4076
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/complex/complexField.C
@@ -0,0 +1,168 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2004-2010, 2019 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+                            | Copyright (C) 2011 OpenFOAM Foundation
+-------------------------------------------------------------------------------
+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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "complexField.H"
+#include "addToRunTimeSelectionTable.H"
+
+#define TEMPLATE
+#include "FieldFunctionsM.C"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineCompoundTypeName(List<complex>, complexList);
+    addCompoundToRunTimeSelectionTable(List<complex>, complexList);
+}
+
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+Foam::complexField Foam::ComplexField
+(
+    const UList<scalar>& re,
+    const UList<scalar>& im
+)
+{
+    complexField cf(re.size());
+
+    forAll(cf, i)
+    {
+        cf[i].Re() = re[i];
+        cf[i].Im() = im[i];
+    }
+
+    return cf;
+}
+
+
+Foam::complexField Foam::ReComplexField(const UList<scalar>& re)
+{
+    complexField cf(re.size());
+
+    forAll(cf, i)
+    {
+        cf[i].Re() = re[i];
+        cf[i].Im() = 0.0;
+    }
+
+    return cf;
+}
+
+
+Foam::complexField Foam::ImComplexField(const UList<scalar>& im)
+{
+    complexField cf(im.size());
+
+    forAll(cf, i)
+    {
+        cf[i].Re() = 0.0;
+        cf[i].Im() = im[i];
+    }
+
+    return cf;
+}
+
+
+Foam::scalarField Foam::ReImSum(const UList<complex>& cf)
+{
+    scalarField sf(cf.size());
+
+    forAll(sf, i)
+    {
+        sf[i] = cf[i].Re() + cf[i].Im();
+    }
+
+    return sf;
+}
+
+
+Foam::scalarField Foam::Re(const UList<complex>& cf)
+{
+    scalarField sf(cf.size());
+
+    forAll(sf, i)
+    {
+        sf[i] = cf[i].Re();
+    }
+
+    return sf;
+}
+
+
+Foam::scalarField Foam::Im(const UList<complex>& cf)
+{
+    scalarField sf(cf.size());
+
+    forAll(sf, i)
+    {
+        sf[i] = cf[i].Im();
+    }
+
+    return sf;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+UNARY_FUNCTION(complex, complex, pow3)
+UNARY_FUNCTION(complex, complex, pow4)
+UNARY_FUNCTION(complex, complex, pow5)
+UNARY_FUNCTION(complex, complex, pow6)
+UNARY_FUNCTION(complex, complex, pow025)
+UNARY_FUNCTION(complex, complex, sqrt)
+UNARY_FUNCTION(complex, complex, exp)
+UNARY_FUNCTION(complex, complex, log)
+UNARY_FUNCTION(complex, complex, log10)
+UNARY_FUNCTION(complex, complex, sin)
+UNARY_FUNCTION(complex, complex, cos)
+UNARY_FUNCTION(complex, complex, tan)
+UNARY_FUNCTION(complex, complex, asin)
+UNARY_FUNCTION(complex, complex, acos)
+UNARY_FUNCTION(complex, complex, atan)
+UNARY_FUNCTION(complex, complex, sinh)
+UNARY_FUNCTION(complex, complex, cosh)
+UNARY_FUNCTION(complex, complex, tanh)
+UNARY_FUNCTION(complex, complex, asinh)
+UNARY_FUNCTION(complex, complex, acosh)
+UNARY_FUNCTION(complex, complex, atanh)
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "undefFieldFunctionsM.H"
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/complex/complexField.H b/src/OpenFOAM/fields/Fields/complex/complexField.H
new file mode 100644
index 0000000000..c9b9351364
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/complex/complexField.H
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2004-2010, 2019 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+                            | Copyright (C) 2011 OpenFOAM Foundation
+-------------------------------------------------------------------------------
+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/>.
+
+Typedef
+    Foam::complexField
+
+Description
+    Specialisation of Field\<T\> for complex.
+
+SourceFiles
+    complexField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef complexField_H
+#define complexField_H
+
+#include "complex.H"
+#include "scalarField.H"
+
+#define TEMPLATE
+#include "FieldFunctionsM.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef Field<complex> complexField;
+
+//- Zip up two lists of values into a list of complex
+complexField ComplexField
+(
+    const UList<scalar>& re,
+    const UList<scalar>& im
+);
+
+//- Create complex field from a list of real (using imag == 0)
+complexField ReComplexField(const UList<scalar>& re);
+
+//- Create complex field from a list of imag (using real == 0)
+complexField ImComplexField(const UList<scalar>& im);
+
+//- Extract real component
+scalarField Re(const UList<complex>& cf);
+
+//- Extract imag component
+scalarField Im(const UList<complex>& cf);
+
+//- Sum real and imag components
+scalarField ReImSum(const UList<complex>& cf);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+UNARY_FUNCTION(complex, complex, pow3)
+UNARY_FUNCTION(complex, complex, pow4)
+UNARY_FUNCTION(complex, complex, pow5)
+UNARY_FUNCTION(complex, complex, pow6)
+UNARY_FUNCTION(complex, complex, pow025)
+UNARY_FUNCTION(complex, complex, sqrt)
+UNARY_FUNCTION(complex, complex, exp)
+UNARY_FUNCTION(complex, complex, log)
+UNARY_FUNCTION(complex, complex, log10)
+UNARY_FUNCTION(complex, complex, sin)
+UNARY_FUNCTION(complex, complex, cos)
+UNARY_FUNCTION(complex, complex, tan)
+UNARY_FUNCTION(complex, complex, asin)
+UNARY_FUNCTION(complex, complex, acos)
+UNARY_FUNCTION(complex, complex, atan)
+UNARY_FUNCTION(complex, complex, sinh)
+UNARY_FUNCTION(complex, complex, cosh)
+UNARY_FUNCTION(complex, complex, tanh)
+UNARY_FUNCTION(complex, complex, asinh)
+UNARY_FUNCTION(complex, complex, acosh)
+UNARY_FUNCTION(complex, complex, atanh)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "undefFieldFunctionsM.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/complex/complexFields.H b/src/OpenFOAM/fields/Fields/complex/complexFields.H
new file mode 100644
index 0000000000..ef031db0e4
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/complex/complexFields.H
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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/>.
+
+InClass
+    Foam::complexFields
+
+Description
+    Specialisations of Field\<T\> for complex and complexVector
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef complexFields_H
+#define complexFields_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "complexField.H"
+#include "complexVectorField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/complex/complexVectorField.C b/src/OpenFOAM/fields/Fields/complex/complexVectorField.C
new file mode 100644
index 0000000000..3ac98022f5
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/complex/complexVectorField.C
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2004-2010, 2019 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+                            | Copyright (C) 2011 OpenFOAM Foundation
+-------------------------------------------------------------------------------
+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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "complexVectorField.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineCompoundTypeName(List<complexVector>, complexVectorList);
+    addCompoundToRunTimeSelectionTable(List<complexVector>, complexVectorList);
+}
+
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+Foam::complexVectorField Foam::ComplexField
+(
+    const UList<vector>& re,
+    const UList<vector>& im
+)
+{
+    complexVectorField cvf(re.size());
+
+    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
+    {
+        forAll(cvf, i)
+        {
+            cvf[i].component(cmpt).Re() = re[i].component(cmpt);
+            cvf[i].component(cmpt).Im() = im[i].component(cmpt);
+        }
+    }
+
+    return cvf;
+}
+
+
+Foam::complexVectorField Foam::ReComplexField(const UList<vector>& re)
+{
+    complexVectorField cvf(re.size());
+
+    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
+    {
+        forAll(cvf, i)
+        {
+            cvf[i].component(cmpt).Re() = re[i].component(cmpt);
+            cvf[i].component(cmpt).Im() = 0.0;
+        }
+    }
+
+    return cvf;
+}
+
+
+Foam::complexVectorField Foam::ImComplexField(const UList<vector>& im)
+{
+    complexVectorField cvf(im.size());
+
+    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
+    {
+        forAll(cvf, i)
+        {
+            cvf[i].component(cmpt).Re() = 0.0;
+            cvf[i].component(cmpt).Im() = im[i].component(cmpt);
+        }
+    }
+
+    return cvf;
+}
+
+
+Foam::vectorField Foam::ReImSum(const UList<complexVector>& cvf)
+{
+    vectorField vf(cvf.size());
+
+    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
+    {
+        forAll(cvf, i)
+        {
+            vf[i].component(cmpt) =
+                cvf[i].component(cmpt).Re() + cvf[i].component(cmpt).Im();
+        }
+    }
+
+    return vf;
+}
+
+
+Foam::vectorField Foam::Re(const UList<complexVector>& cvf)
+{
+    vectorField vf(cvf.size());
+
+    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
+    {
+        forAll(cvf, i)
+        {
+            vf[i].component(cmpt) = cvf[i].component(cmpt).Re();
+        }
+    }
+
+    return vf;
+}
+
+
+Foam::vectorField Foam::Im(const UList<complexVector>& cvf)
+{
+    vectorField vf(cvf.size());
+
+    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
+    {
+        forAll(cvf, i)
+        {
+            vf[i].component(cmpt) = cvf[i].component(cmpt).Im();
+        }
+    }
+
+    return vf;
+}
+
+
+Foam::complexVectorField Foam::operator^
+(
+    const UList<vector>& vf,
+    const UList<complexVector>& cvf
+)
+{
+    return ComplexField(vf^Re(cvf), vf^Im(cvf));
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/complexFields/complexFields.H b/src/OpenFOAM/fields/Fields/complex/complexVectorField.H
similarity index 64%
rename from src/OpenFOAM/fields/Fields/complexFields/complexFields.H
rename to src/OpenFOAM/fields/Fields/complex/complexVectorField.H
index 13e02472c9..507a6dc51d 100644
--- a/src/OpenFOAM/fields/Fields/complexFields/complexFields.H
+++ b/src/OpenFOAM/fields/Fields/complex/complexVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2010, 2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011 OpenFOAM Foundation
@@ -23,12 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::complexField
-
-Description
-    Specialisation of Field\<T\> for complex.
-
 Typedef
     Foam::complexVectorField
 
@@ -36,49 +30,53 @@ Description
     Specialisation of Field\<T\> for complexVector.
 
 SourceFiles
-    complexFields.C
+    complexVectorField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef complexFields_H
-#define complexFields_H
+#ifndef complexVectorField_H
+#define complexVectorField_H
 
 #include "complex.H"
 #include "complexVector.H"
-#include "primitiveFields.H"
+#include "vectorField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-typedef Field<complex> complexField;
-
-complexField ComplexField(const UList<scalar>&, const UList<scalar>&);
-complexField ReComplexField(const UList<scalar>&);
-complexField ImComplexField(const UList<scalar>&);
-scalarField Re(const UList<complex>&);
-scalarField Im(const UList<complex>&);
-scalarField ReImSum(const UList<complex>&);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 typedef Field<complexVector> complexVectorField;
 
-complexVectorField ComplexField(const UList<vector>&, const UList<vector>&);
-complexVectorField ReComplexField(const UList<vector>&);
-complexVectorField ImComplexField(const UList<vector>&);
-vectorField Re(const UList<complexVector>&);
-vectorField Im(const UList<complexVector>&);
-vectorField ReImSum(const UList<complexVector>&);
+//- Zip up two lists of values into a list of complex
+complexVectorField ComplexField
+(
+    const UList<vector>& re,
+    const UList<vector>& im
+);
+
+
+//- Create complex field from a list of real (using imag == 0)
+complexVectorField ReComplexField(const UList<vector>& re);
+
+//- Create complex field from a list of imag (using real == 0)
+complexVectorField ImComplexField(const UList<vector>& im);
+
+//- Extract real component
+vectorField Re(const UList<complexVector>& cvf);
+
+//- Extract imag component
+vectorField Im(const UList<complexVector>& cvf);
+
+//- Sum real and imag components
+vectorField ReImSum(const UList<complexVector>& cvf);
 
 complexVectorField operator^
 (
-    const UList<vector>&,
-    const UList<complexVector>&
+    const UList<vector>& vf,
+    const UList<complexVector>& cvf
 );
 
 
diff --git a/src/OpenFOAM/fields/Fields/complexFields/complexFields.C b/src/OpenFOAM/fields/Fields/complexFields/complexFields.C
deleted file mode 100644
index df9203067c..0000000000
--- a/src/OpenFOAM/fields/Fields/complexFields/complexFields.C
+++ /dev/null
@@ -1,248 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2011 OpenFOAM Foundation
--------------------------------------------------------------------------------
-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
-    Specialisation of Field\<T\> for complex and complexVector.
-
-\*---------------------------------------------------------------------------*/
-
-#include "complexFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineCompoundTypeName(List<complex>, complexList);
-addCompoundToRunTimeSelectionTable(List<complex>, complexList);
-
-complexField ComplexField(const UList<scalar>& re, const UList<scalar>& im)
-{
-    complexField cf(re.size());
-
-    forAll(cf, i)
-    {
-        cf[i].Re() = re[i];
-        cf[i].Im() = im[i];
-    }
-
-    return cf;
-}
-
-
-complexField ReComplexField(const UList<scalar>& sf)
-{
-    complexField cf(sf.size());
-
-    forAll(cf, i)
-    {
-        cf[i].Re() = sf[i];
-        cf[i].Im() = 0.0;
-    }
-
-    return cf;
-}
-
-
-complexField ImComplexField(const UList<scalar>& sf)
-{
-    complexField cf(sf.size());
-
-    forAll(cf, i)
-    {
-        cf[i].Re() = 0.0;
-        cf[i].Im() = sf[i];
-    }
-
-    return cf;
-}
-
-
-scalarField ReImSum(const UList<complex>& cf)
-{
-    scalarField sf(cf.size());
-
-    forAll(sf, i)
-    {
-        sf[i] = cf[i].Re() + cf[i].Im();
-    }
-
-    return sf;
-}
-
-
-scalarField Re(const UList<complex>& cf)
-{
-    scalarField sf(cf.size());
-
-    forAll(sf, i)
-    {
-        sf[i] = cf[i].Re();
-    }
-
-    return sf;
-}
-
-
-scalarField Im(const UList<complex>& cf)
-{
-    scalarField sf(cf.size());
-
-    forAll(sf, i)
-    {
-        sf[i] = cf[i].Im();
-    }
-
-    return sf;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineCompoundTypeName(List<complexVector>, complexVectorList);
-addCompoundToRunTimeSelectionTable(List<complexVector>, complexVectorList);
-
-complexVectorField ComplexField
-(
-    const UList<vector>& re,
-    const UList<vector>& im
-)
-{
-    complexVectorField cvf(re.size());
-
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        forAll(cvf, i)
-        {
-            cvf[i].component(cmpt).Re() = re[i].component(cmpt);
-            cvf[i].component(cmpt).Im() = im[i].component(cmpt);
-        }
-    }
-
-    return cvf;
-}
-
-
-complexVectorField ReComplexField(const UList<vector>& vf)
-{
-    complexVectorField cvf(vf.size());
-
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        forAll(cvf, i)
-        {
-            cvf[i].component(cmpt).Re() = vf[i].component(cmpt);
-            cvf[i].component(cmpt).Im() = 0.0;
-        }
-    }
-
-    return cvf;
-}
-
-
-complexVectorField ImComplexField(const UList<vector>& vf)
-{
-    complexVectorField cvf(vf.size());
-
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        forAll(cvf, i)
-        {
-            cvf[i].component(cmpt).Re() = 0.0;
-            cvf[i].component(cmpt).Im() = vf[i].component(cmpt);
-        }
-    }
-
-    return cvf;
-}
-
-
-vectorField ReImSum(const UList<complexVector>& cvf)
-{
-    vectorField vf(cvf.size());
-
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        forAll(cvf, i)
-        {
-            vf[i].component(cmpt) =
-                cvf[i].component(cmpt).Re() + cvf[i].component(cmpt).Im();
-        }
-    }
-
-    return vf;
-}
-
-
-vectorField Re(const UList<complexVector>& cvf)
-{
-    vectorField vf(cvf.size());
-
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        forAll(cvf, i)
-        {
-            vf[i].component(cmpt) = cvf[i].component(cmpt).Re();
-        }
-    }
-
-    return vf;
-}
-
-
-vectorField Im(const UList<complexVector>& cvf)
-{
-    vectorField vf(cvf.size());
-
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        forAll(cvf, i)
-        {
-            vf[i].component(cmpt) = cvf[i].component(cmpt).Im();
-        }
-    }
-
-    return vf;
-}
-
-
-complexVectorField operator^
-(
-    const UList<vector>& vf,
-    const UList<complexVector>& cvf
-)
-{
-    return ComplexField(vf^Re(cvf), vf^Im(cvf));
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //

From 13fbefcac7631e8fcc25b8dde1d161b3dc5d123a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 29 Mar 2019 12:32:21 +0100
Subject: [PATCH 12/15] TUT: include samples instead of cuttingPlane (closes
 #1254)

---
 .../incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict
index b8096e514d..283724bc2d 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict
@@ -49,7 +49,7 @@ runTimeModifiable true;
 
 functions
 {
-    #include "cuttingPlane"
+    #include "samples"
     #include "streamLines"
     #include "forceCoeffs"
 }

From 98db208975590b682d3016fadc7c4f052b637875 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 1 Apr 2019 07:51:54 +0200
Subject: [PATCH 13/15] STYLE: missing inline specifier (#1263)

---
 src/OpenFOAM/meshes/boundBox/boundBoxI.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/meshes/boundBox/boundBoxI.H b/src/OpenFOAM/meshes/boundBox/boundBoxI.H
index fe36e9345c..c2f683b435 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBoxI.H
+++ b/src/OpenFOAM/meshes/boundBox/boundBoxI.H
@@ -159,7 +159,7 @@ inline Foam::scalar Foam::boundBox::avgDim() const
 }
 
 
-Foam::label Foam::boundBox::nDim() const
+inline Foam::label Foam::boundBox::nDim() const
 {
     label ngood = 0;
 

From ac065990d40831c26beed5fa2dcb7128cd82d2f3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 1 Apr 2019 09:03:48 +0200
Subject: [PATCH 14/15] ENH: support wmake -show options for compiler
 information (#1256)

- can be useful for retrieving the compilation flags for use with other
  make systems (eg, cmake)

  * wmake -show-compile   (C++ not C)
  * wmake -show-cxx
  * wmake -show-cxxflags
---
 wmake/makefiles/general |  2 +-
 wmake/makefiles/info    | 74 +++++++++++++++++++++++++++++++++++++++++
 wmake/wmake             | 24 +++++++++++--
 3 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 wmake/makefiles/info

diff --git a/wmake/makefiles/general b/wmake/makefiles/general
index 6b7fc6e4b6..198e5c1e59 100644
--- a/wmake/makefiles/general
+++ b/wmake/makefiles/general
@@ -31,7 +31,7 @@ endif
 
 
 #------------------------------------------------------------------------------
-# Unset suffices list (suffix rules are not used)
+# No default suffix rules used
 #------------------------------------------------------------------------------
 
 .SUFFIXES:
diff --git a/wmake/makefiles/info b/wmake/makefiles/info
new file mode 100644
index 0000000000..90fa2b550d
--- /dev/null
+++ b/wmake/makefiles/info
@@ -0,0 +1,74 @@
+#----------------------------*- makefile-gmake -*------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
+#
+# File
+#     wmake/makefiles/info
+#
+# Description
+#     Makefile to generate information.
+#     Used by wmake -show-*
+#
+#------------------------------------------------------------------------------
+
+#------------------------------------------------------------------------------
+# Use POSIX shell. Default to POSIX for the OS.
+#------------------------------------------------------------------------------
+
+SHELL   = /bin/sh
+
+#------------------------------------------------------------------------------
+# No default suffix rules used
+#------------------------------------------------------------------------------
+
+.SUFFIXES:
+
+
+#------------------------------------------------------------------------------
+# Compilation rules
+#------------------------------------------------------------------------------
+
+GENERAL_RULES = $(WM_DIR)/rules/General
+include $(GENERAL_RULES)/general
+
+
+#------------------------------------------------------------------------------
+# Display information
+#------------------------------------------------------------------------------
+
+export WM_VERSION
+
+
+.PHONY: compile
+compile:
+	@echo "$(strip $(CC) $(c++FLAGS))"
+
+.PHONY: api
+api:
+	@echo "$${WM_VERSION#*=}"
+
+.PHONY: c
+c:
+	@echo "$(strip $(cc))"
+
+.PHONY: cflags
+cflags:
+	@echo "$(strip $(cFLAGS))"
+
+.PHONY: cxx
+cxx:
+	@echo "$(strip $(CC))"
+
+.PHONY: cxxflags
+cxxflags:
+	@echo "$(strip $(c++FLAGS))"
+
+
+#----------------------------- vim: set ft=make: ------------------------------
diff --git a/wmake/wmake b/wmake/wmake
index 7a1e6ebe1f..d9b43e001e 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -77,6 +77,11 @@ options:
   -pwd              Print root directory containing a Make/ directory and exit
   -update           Update lnInclude directories, dep files, remove deprecated
                     files and directories
+  -show             Identical to -show-compile
+  -show-api         Print api value and exit
+  -show-compile     Print C++ compiler value/flags and exit
+  -show-cxx         Print C++ compiler value and exit
+  -show-cxxflags    Print C++ compiler flags and exit
   -h | -help        Print the usage
 
 
@@ -121,7 +126,7 @@ allCores()
 #------------------------------------------------------------------------------
 
 # Default to compiling the local target only
-unset all update optPrintRootDir
+unset all optShow update optPrintRootDir
 
 while [ "$#" -gt 0 ]
 do
@@ -133,6 +138,14 @@ do
         -s | -silent)
             export WM_QUIET=true
             ;;
+        -show | -show-compile)
+            $make -f $WM_DIR/makefiles/info compile
+            optShow=true
+            ;;
+        -show-api | -show-cxx | -show-cxxflags | -show-c | -show-cflags)
+            $make -f $WM_DIR/makefiles/info "${1#-show-}"
+            optShow=true
+            ;;
         -a | -all | all)
             all=all
             ;;
@@ -147,12 +160,12 @@ do
 
             [ "$nCores" = 0 ] && allCores
             export WM_NCOMPPROCS=$nCores
-            echo "Compiling enabled on $WM_NCOMPPROCS cores"
+            echo "Compiling enabled on $WM_NCOMPPROCS cores" 1>&2
             ;;
         # Parallel compilation on specified number of cores
         -j[1-9]*)
             export WM_NCOMPPROCS=${1#-j}
-            echo "Compiling enabled on $WM_NCOMPPROCS cores"
+            echo "Compiling enabled on $WM_NCOMPPROCS cores" 1>&2
             ;;
         # Keep going, ignoring errors
         -k | -keep-going | -non-stop)
@@ -190,6 +203,11 @@ do
     shift
 done
 
+if [ "$optShow" = true ]
+then
+    exit 0
+fi
+
 
 #------------------------------------------------------------------------------
 # Check environment variables

From b4e3f8c8aff2017057aca21b53890730800295a8 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 1 Apr 2019 09:48:23 +0100
Subject: [PATCH 15/15] ENH: renumberMesh: renumber refinement data. Fixes
 #1241.

---
 .../manipulation/renumberMesh/renumberMesh.C  | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index f8d08abc5a..0780059017 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -55,7 +55,7 @@ Description
 #include "faceSet.H"
 #include "pointSet.H"
 #include "processorMeshes.H"
-#include "hexRef8.H"
+#include "hexRef8Data.H"
 
 #ifdef HAVE_ZOLTAN
     #include "zoltanRenumber.H"
@@ -1327,8 +1327,24 @@ int main(int argc, char *argv[])
 
     // Remove old procAddressing files
     processorMeshes::removeFiles(mesh);
-    // Remove refinement data
-    hexRef8::removeFiles(mesh);
+
+    // Update refinement data
+    hexRef8Data refData
+    (
+        IOobject
+        (
+            "dummy",
+            mesh.facesInstance(),
+            polyMesh::meshSubDir,
+            mesh,
+            IOobject::READ_IF_PRESENT,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+    refData.updateMesh(map());
+    refData.write();
+
     // Update sets
     topoSet::updateMesh(mesh.facesInstance(), map(), cellSets);
     topoSet::updateMesh(mesh.facesInstance(), map(), faceSets);