From ad98934e90c4b3e1e71eabf90af6b1a96367c1fa Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Thu, 25 Jan 2018 08:46:48 -0800
Subject: [PATCH 1/9] ENH: Changing fanFvPatchField operation for
 non-dimensional mode. The non-dimensional table takes non-dimensional U as
 entry, not flow rate

---
 .../fields/fvPatchFields/derived/fan/fanFvPatchFields.C    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
index 3570d327b9..7e7e78f355 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,11 +51,10 @@ void Foam::fanFvPatchField<Foam::scalar>::calcFanJump()
 
             if (nonDimensional_)
             {
-                // Create an adimensional volumetric flow rate
+                // Create an adimensional velocity
                 Un =
                     120.0*Un/pow3(constant::mathematical::pi)
-                  * patch().magSf()
-                  / pow3(dm_)/rpm_;
+                  / dm_/rpm_;
             }
         }
 

From 7ec44a88f173737d6469400f57f855b2d7dc6062 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Thu, 25 Jan 2018 10:04:30 -0800
Subject: [PATCH 2/9] ENH: Updating the header documentation for
 fanFvPatchField

---
 .../fields/fvPatchFields/derived/fan/fanFvPatchField.H    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
index 975da7ab2e..ed95c018b3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,12 +37,12 @@ Description
     The switch nonDimensional can be used for a non-dimensional table. It needs
     inputs rpm and dm of the fan. It should be used with uniformJump true.
 
-    The nonDimensional flux for the table is calculate as :
+    The nonDimensional U for the table is calculate as :
 
-        phi = 4.0*mDot/(rho*sqr(PI)*dm^3*omega)
+        phi = 120*Un/(PI^3*dm*rpm)
         where:
             dm is the mean diameter.
-            omega is rad/sec.
+            rpm is the RPM of the fan.
 
     The nonDimensinal pressure :
 

From ac3a8bc3cb906eefe10b613edd9f8f6a9931b3bd Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Fri, 23 Feb 2018 09:04:16 +0000
Subject: [PATCH 3/9] BUG: simpleCoalParcelFoam - corrected dimensions of Qdot.
  Fixes #742

---
 .../solvers/lagrangian/simpleCoalParcelFoam/createFields.H      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H b/applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H
index ae5129fbc2..983ecf2597 100644
--- a/applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H
@@ -114,7 +114,7 @@ volScalarField Qdot
         IOobject::AUTO_WRITE
     ),
     mesh,
-    dimensionedScalar("Qdot", dimEnergy/dimTime, 0.0)
+    dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0)
 );
 
 #include "createMRF.H"

From 4d4c5910eddbd67d51467e468e9ee1b0702da2b9 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Fri, 23 Feb 2018 12:00:14 +0000
Subject: [PATCH 4/9] ENH: lagrangian injection - exposed minimum number of
 particles per parcel. See #728

The minimum number of particles per parcel can now be set in the
injection model input, e.g.:

    model1
    {
        type            ...;
        massTotal       ...;
        parcelBasisType ...;
        minParticlesPerParcel 1; <-- new optional entry
        SOI             ...;
        ...

Uses a value of 1 by default if the entry is not present.  The value of
1 is generally recommended and beneficial for coupled cases where small
time steps can lead to the injection of too many parcels and subsequently
greatly over-predict the particle source contributions (momentum, heat,
mass transfer etc)
---
 .../InjectionModel/InjectionModel/InjectionModel.C | 11 +++++++++--
 .../InjectionModel/InjectionModel/InjectionModel.H | 14 +++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 37dd01da99..48286f170d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -275,6 +275,7 @@ Foam::InjectionModel<CloudType>::InjectionModel(CloudType& owner)
     nParticleFixed_(0.0),
     time0_(0.0),
     timeStep0_(this->template getModelProperty<scalar>("timeStep0")),
+    minParticlesPerParcel_(1),
     delayedVolume_(0.0),
     injectorID_(-1)
 {}
@@ -304,6 +305,11 @@ Foam::InjectionModel<CloudType>::InjectionModel
     nParticleFixed_(0.0),
     time0_(owner.db().time().value()),
     timeStep0_(this->template getModelProperty<scalar>("timeStep0")),
+    minParticlesPerParcel_
+    (
+        this->coeffDict().template
+            lookupOrDefault<scalar>("minParticlesPerParcel", 1)
+    ),
     delayedVolume_(0.0),
     injectorID_(this->coeffDict().lookupOrDefault("injectorID", -1))
 {
@@ -382,6 +388,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
     nParticleFixed_(im.nParticleFixed_),
     time0_(im.time0_),
     timeStep0_(im.timeStep0_),
+    minParticlesPerParcel_(im.minParticlesPerParcel_),
     delayedVolume_(im.delayedVolume_),
     injectorID_(im.injectorID_)
 {}
@@ -517,7 +524,7 @@ void Foam::InjectionModel<CloudType>::inject
                             pPtr->rho()
                         );
 
-                    if (pPtr->nParticle() >= 1.0)
+                    if (pPtr->nParticle() >= minParticlesPerParcel_)
                     {
                         parcelsAdded++;
                         massAdded += pPtr->nParticle()*pPtr->mass();
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index f235314642..952fa334c5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -81,7 +81,7 @@ public:
     // Enumerations
 
         //- Parcel basis representation options
-        //  i.e constant number of particles OR constant mass per parcel
+        //- i.e constant number of particles OR constant mass per parcel
         enum parcelBasis
         {
             pbNumber,
@@ -100,7 +100,7 @@ protected:
             scalar SOI_;
 
             //- Total volume of particles introduced by this injector [m^3]
-            //  - scaled to ensure massTotal is achieved
+            //- Note: scaled to ensure massTotal is achieved
             scalar volumeTotal_;
 
             //- Total mass to inject [kg]
@@ -128,7 +128,7 @@ protected:
             parcelBasis parcelBasis_;
 
             //- nParticle to assign to parcels when the 'fixed' basis
-            //  is selected
+            //- is selected
             scalar nParticleFixed_;
 
             //- Continuous phase time at start of injection time step [s]
@@ -137,8 +137,12 @@ protected:
             //- Time at start of injection time step [s]
             scalar timeStep0_;
 
+            //- Minimum number of particles used to represent each parcel
+            //- default = 1
+            scalar minParticlesPerParcel_;
+
             //- Volume that should have been injected, but would lead to
-            //  less than 1 particle per parcel
+            //- less than minParticlesPerParcel_ particle per parcel
             scalar delayedVolume_;
 
             //- Optional injector ID

From 94afd9e9b2f7a8a09edc40ca0dfa96af50eb671f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 23 Feb 2018 15:11:24 +0100
Subject: [PATCH 5/9] BUG: isoAdvection using 'vof2IsoTol' instead of
 'isoFaceTol' (closes #740)

---
 .../solvers/isoAdvection/isoAdvection/isoAdvection.C          | 4 ++--
 .../solvers/isoAdvection/isoAdvection/isoAdvection.H          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
index 85ebdf94b6..e039b0b572 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
@@ -80,7 +80,7 @@ Foam::isoAdvection::isoAdvection
 
     // Tolerances and solution controls
     nAlphaBounds_(dict_.lookupOrDefault<label>("nAlphaBounds", 3)),
-    vof2IsoTol_(dict_.lookupOrDefault<scalar>("vof2IsoTol", 1e-8)),
+    isoFaceTol_(dict_.lookupOrDefault<scalar>("isoFaceTol", 1e-8)),
     surfCellTol_(dict_.lookupOrDefault<scalar>("surfCellTol", 1e-8)),
     gradAlphaBasedNormal_
     (
@@ -249,7 +249,7 @@ void Foam::isoAdvection::timeIntegratedFlux()
             (
                 celli,
                 alpha1In_[celli],
-                vof2IsoTol_,
+                isoFaceTol_,
                 maxIter
             );
 
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H
index 13899054fe..bc2d96ee93 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H
@@ -119,7 +119,7 @@ class isoAdvection
             label nAlphaBounds_;
 
             //- Tolerance for search of isoFace giving specified VOF value
-            scalar vof2IsoTol_;
+            scalar isoFaceTol_;
 
             //- Tolerance for marking of surface cells:
             //  Those with surfCellTol_ < alpha1 < 1 - surfCellTol_

From 9f03511ffbfef723bf0b762c391c093e8f009bc0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 28 Feb 2018 10:59:53 +0100
Subject: [PATCH 6/9] GIT: merge artifact duplicate call to update mesh moving

---
 src/sampling/sampledSet/face/faceOnlySet.C | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/sampling/sampledSet/face/faceOnlySet.C b/src/sampling/sampledSet/face/faceOnlySet.C
index b471711ea6..ba351d2237 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.C
+++ b/src/sampling/sampledSet/face/faceOnlySet.C
@@ -166,7 +166,6 @@ void Foam::faceOnlySet::calcSamples
         // Set points and cell/face labels to empty lists
         //Info<< "calcSamples : Both start_ and end_ outside domain"
         //    << endl;
-        const_cast<polyMesh&>(mesh()).moving(oldMoving);
 
         const_cast<polyMesh&>(mesh()).moving(oldMoving);
         return;

From 628f0860c39ef0f3bdfc2f6f7e1dd0a41d831bea Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 28 Feb 2018 11:23:59 +0100
Subject: [PATCH 7/9] BUG: faceOnlySet sampling does not stop at 'end' (closes
 #745)

---
 src/sampling/sampledSet/face/faceOnlySet.C    |  7 ++-
 .../damBreak/damBreak/system/controlDict      |  1 +
 .../laminar/damBreak/damBreak/system/sampling | 54 +++++++++++++++++++
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling

diff --git a/src/sampling/sampledSet/face/faceOnlySet.C b/src/sampling/sampledSet/face/faceOnlySet.C
index ba351d2237..bf1793d944 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.C
+++ b/src/sampling/sampledSet/face/faceOnlySet.C
@@ -54,6 +54,8 @@ bool Foam::faceOnlySet::trackToBoundary
     DynamicList<scalar>& samplingCurveDist
 ) const
 {
+    const vector offset = (end_ - start_);
+
     particle::trackingData td(particleCloud);
 
     point trackPt = singleParticle.position();
@@ -75,9 +77,10 @@ bool Foam::faceOnlySet::trackToBoundary
             samplingCurveDist.append(mag(trackPt - start_));
         }
 
-        if (mag(trackPt - end_) < smallDist)
+        if (-smallDist < ((trackPt - end_) & offset))
         {
-            // End reached
+            // Projected onto sampling vector
+            // - done when we are near or past the end of the sampling vector
             return false;
         }
         else if (singleParticle.onBoundaryFace())
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict
index e306a5ca5c..06168ee7c2 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict
@@ -52,5 +52,6 @@ maxAlphaCo      1;
 
 maxDeltaT       1;
 
+#includeIfPresent "sampling"
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling
new file mode 100644
index 0000000000..7ea9028392
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      sampling;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+functions
+{
+    sampleSets
+    {
+        type    sets;
+        libs    ("libsampling.so");
+
+        writeControl  timeStep;
+        writeInterval 1;
+
+        setFormat           vtk;
+        interpolationScheme cellPointFace;
+        fields ( alpha.water );
+
+        sets
+        (
+            gauge_1
+            {
+                type    face;
+                axis    y;
+                start   (0.02 0.20 0.005);
+                end     (0.02 0.25 0.005);
+                nPoints 100;
+            }
+
+            gauge_2
+            {
+                type    face;
+                axis    y;
+                start   (0.2 0.03 0.005);
+                end     (0.2 0.55 0.005);
+                nPoints 100;
+            }
+        );
+    }
+}
+
+// ************************************************************************* //

From 7f7f9336c82e4b86474602417bbaa7498c346719 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 28 Feb 2018 14:31:48 +0100
Subject: [PATCH 8/9] COMP: add -fpermissive to c++LESSWARN flags (closes #744)

- downgrades some diagnostics about nonconformant code from errors to
  warnings. Oddly enough, the errors actually arise from STL library
  elements shipped with gcc itself. Affects kahip compilation with
  gcc-6, gcc-7
---
 wmake/rules/linux64Gcc/c++      | 6 ++++--
 wmake/rules/linux64GccKNL/c++   | 6 ++++--
 wmake/rules/linuxARM64Gcc/c++   | 6 ++++--
 wmake/rules/linuxARM7Gcc/c++    | 6 ++++--
 wmake/rules/linuxGcc/c++        | 6 ++++--
 wmake/rules/linuxIA64Gcc/c++    | 6 ++++--
 wmake/rules/linuxPPC64Gcc/c++   | 6 ++++--
 wmake/rules/linuxPPC64leGcc/c++ | 6 ++++--
 wmake/rules/solaris64Gcc/c++    | 2 +-
 wmake/rules/solarisGcc/c++      | 2 +-
 10 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++
index a94b22983a..fc684d2637 100644
--- a/wmake/rules/linux64Gcc/c++
+++ b/wmake/rules/linux64Gcc/c++
@@ -3,8 +3,10 @@ SUFFIXES += .C .cc .cpp .cxx
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
               -Wno-invalid-offsetof -Wno-attributes
 
-# Suppress some warnings for flex++ and CGAL
-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+# Suppress some warnings (flex++, CGAL, etc)
+c++LESSWARN = \
+    -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds \
+    -fpermissive
 
 CC          = g++ -std=c++11 -m64
 
diff --git a/wmake/rules/linux64GccKNL/c++ b/wmake/rules/linux64GccKNL/c++
index 199d72c0fd..426e87709a 100644
--- a/wmake/rules/linux64GccKNL/c++
+++ b/wmake/rules/linux64GccKNL/c++
@@ -3,8 +3,10 @@ SUFFIXES += .C .cc .cpp .cxx
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
               -Wno-invalid-offsetof -Wno-attributes
 
-# Suppress some warnings for flex++ and CGAL
-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+# Suppress some warnings (flex++, CGAL, etc)
+c++LESSWARN = \
+    -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds \
+    -fpermissive
 
 CC          = g++ -std=c++11 -m64 -march=knl
 
diff --git a/wmake/rules/linuxARM64Gcc/c++ b/wmake/rules/linuxARM64Gcc/c++
index 3985f54a9b..c80f07611f 100644
--- a/wmake/rules/linuxARM64Gcc/c++
+++ b/wmake/rules/linuxARM64Gcc/c++
@@ -3,8 +3,10 @@ SUFFIXES += .C .cc .cpp .cxx
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
               -Wno-invalid-offsetof -Wno-attributes
 
-# Suppress some warnings for flex++ and CGAL
-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+# Suppress some warnings (flex++, CGAL, etc)
+c++LESSWARN = \
+    -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds \
+    -fpermissive
 
 CC          = g++ -std=c++11
 
diff --git a/wmake/rules/linuxARM7Gcc/c++ b/wmake/rules/linuxARM7Gcc/c++
index 3985f54a9b..c80f07611f 100644
--- a/wmake/rules/linuxARM7Gcc/c++
+++ b/wmake/rules/linuxARM7Gcc/c++
@@ -3,8 +3,10 @@ SUFFIXES += .C .cc .cpp .cxx
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
               -Wno-invalid-offsetof -Wno-attributes
 
-# Suppress some warnings for flex++ and CGAL
-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+# Suppress some warnings (flex++, CGAL, etc)
+c++LESSWARN = \
+    -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds \
+    -fpermissive
 
 CC          = g++ -std=c++11
 
diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++
index 3076e7e6c0..989fb670d4 100644
--- a/wmake/rules/linuxGcc/c++
+++ b/wmake/rules/linuxGcc/c++
@@ -3,8 +3,10 @@ SUFFIXES += .C .cc .cpp .cxx
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
               -Wno-invalid-offsetof -Wno-attributes
 
-# Suppress some warnings for flex++ and CGAL
-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+# Suppress some warnings (flex++, CGAL, etc)
+c++LESSWARN = \
+    -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds \
+    -fpermissive
 
 CC          = g++ -std=c++11 -m32
 
diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++
index de9a95ab4b..30ef136038 100644
--- a/wmake/rules/linuxIA64Gcc/c++
+++ b/wmake/rules/linuxIA64Gcc/c++
@@ -3,8 +3,10 @@ SUFFIXES += .C .cc .cpp .cxx
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
               -Wno-invalid-offsetof -Wno-attributes
 
-# Suppress some warnings for flex++ and CGAL
-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+# Suppress some warnings (flex++, CGAL, etc)
+c++LESSWARN = \
+    -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds \
+    -fpermissive
 
 CC          = g++ -std=c++11
 
diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++
index 1bc42bc7cf..1c03f81021 100644
--- a/wmake/rules/linuxPPC64Gcc/c++
+++ b/wmake/rules/linuxPPC64Gcc/c++
@@ -3,8 +3,10 @@ SUFFIXES += .C .cc .cpp .cxx
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
               -Wno-invalid-offsetof -Wno-attributes
 
-# Suppress some warnings for flex++ and CGAL
-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+# Suppress some warnings (flex++, CGAL, etc)
+c++LESSWARN = \
+    -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds \
+    -fpermissive
 
 CC          = g++ -std=c++11 -m64 -mcpu=power5+
 
diff --git a/wmake/rules/linuxPPC64leGcc/c++ b/wmake/rules/linuxPPC64leGcc/c++
index 341a2b5955..c3d60d0fee 100644
--- a/wmake/rules/linuxPPC64leGcc/c++
+++ b/wmake/rules/linuxPPC64leGcc/c++
@@ -3,8 +3,10 @@ SUFFIXES += .C .cc .cpp .cxx
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
               -Wno-invalid-offsetof -Wno-attributes
 
-# Suppress some warnings for flex++ and CGAL
-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+# Suppress some warnings (flex++, CGAL, etc)
+c++LESSWARN = \
+    -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds \
+    -fpermissive
 
 CC          = g++ -std=c++11 -m64 -mcpu=power8
 
diff --git a/wmake/rules/solaris64Gcc/c++ b/wmake/rules/solaris64Gcc/c++
index 74b72eecd8..d5d600a758 100644
--- a/wmake/rules/solaris64Gcc/c++
+++ b/wmake/rules/solaris64Gcc/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C .cc .cpp .cxx
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
               -Wno-invalid-offsetof -Wno-attributes
 
-# Suppress some warnings for flex++ and CGAL
+# Suppress some warnings (flex++, CGAL, etc)
 c++LESSWARN =
 
 CC          = g++ -std=c++11 -m64
diff --git a/wmake/rules/solarisGcc/c++ b/wmake/rules/solarisGcc/c++
index cf37d4c57b..c68c26a29d 100644
--- a/wmake/rules/solarisGcc/c++
+++ b/wmake/rules/solarisGcc/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C .cc .cpp .cxx
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
               -Wno-invalid-offsetof -Wno-attributes
 
-# Suppress some warnings for flex++ and CGAL
+# Suppress some warnings (flex++, CGAL, etc)
 c++LESSWARN =
 
 CC          = g++ -std=c++11

From e78548352e5e41ff821ef763a83d728ef53e2ef5 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Tue, 6 Mar 2018 11:12:39 +0000
Subject: [PATCH 9/9] TUT: Removed misleading comment in tutorial - see #746

---
 tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/U | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/U b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/U
index a03c347987..9ca57c59d9 100644
--- a/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/U
+++ b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/U
@@ -17,7 +17,6 @@ FoamFile
 
 dimensions      [ 0 1 -1 0 0 0 0 ];
 
-// Re = 395, L = pi, utau = 1, nu = pi/395 = 7.9534e-3
 // Ub/utau = 17.55
 internalField   uniform ( 17.55 0 0 );