BUG: incorrect startLineNumber for primitiveEntry (fixes #1706)

- the foamConfigurePaths script is quite simplistic and aggressive in
  what it changes. This was particularly evident when using it to
  change gcc/clang versions.

  Restructured the corresponding compiler settings to define default
  versions (eg, "default_gcc_version") that limits the scope of
  changes performed by foamConfigurePaths and makes it easier to
  understand if changing manually.

META-INFO/.gitignore

@@ -0,0 +1,9 @@
+# Do not track build information
+build-info
+
+# Do not track time-stamp
+time-stamp
+
+# Do not track any manifest files
+Manifest.txt
+manifest.txt

META-INFO/README.md

@@ -0,0 +1,5 @@
+# META-INFO
+
+Meta-information is for OpenFOAM internal use only.
+
+(Backport from 1812)

META-INFO/api-info

@@ -0,0 +1,2 @@
+api=1712
+patch=200131

applications/solvers/DNS/dnsFoam/dnsFoam.C

@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
             fft::reverseTransform
             (
                 K/(mag(K) + 1.0e-6) ^ forceGen.newField(), K.nn()
-            )
+            )*recRootN
         );
 
         #include "globalProperties.H"

applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H

@@ -19,3 +19,10 @@
 
     Kmesh K(mesh);
     UOprocess forceGen(K, runTime.deltaTValue(), turbulenceProperties);
+
+    label ntot = 1;
+    forAll(K.nn(), idim)
+    {
+        ntot *= K.nn()[idim];
+    }
+    const scalar recRootN = 1.0/Foam::sqrt(scalar(ntot));

applications/solvers/finiteArea/sphereSurfactantFoam/Make/files

@@ -1,3 +1,3 @@
 surfactantFoam.C
 
-EXE = $(FOAM_USER_APPBIN)/sphereSurfactantFoam
+EXE = $(FOAM_APPBIN)/sphereSurfactantFoam

applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C

@@ -70,6 +70,12 @@ makeLaminarModel(Stokes);
 #include "kEpsilon.H"
 makeRASModel(kEpsilon);
 
+#include "realizableKE.H"
+makeRASModel(realizableKE);
+
+#include "kOmegaSST.H"
+makeRASModel(kOmegaSST);
+
 #include "Smagorinsky.H"
 makeLESModel(Smagorinsky);
 

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"

applications/solvers/multiphase/interIsoFoam/Make/options

@@ -17,4 +17,5 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
-    -lsampling
+    -lsampling \
+    -lwaveModels

applications/test/dictionary/testDictAPI

@@ -0,0 +1,19 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v1812                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      testDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+_FOAM_API  $FOAM_API;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/test/error/Test-error.C

@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
             << "Error 2"
             << exit(FatalError);
     }
-    catch (Foam::error& fErr)
+    catch (const Foam::error& fErr)
     {
         Serr<< "Caught Foam error " << fErr << nl << endl;
     }
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
             << "Error# 3"
             << exit(FatalError);
     }
-    catch (Foam::error& fErr)
+    catch (const Foam::error& fErr)
     {
         Serr<< "Caught Foam error " << fErr << nl << endl;
     }

applications/test/faces/Test-faces.C

@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
         labelledTri l1{ 1, 2, 3, 10, 24 };
         Info<< "labelled:" << l1 << nl;
     }
-    catch (Foam::error& err)
+    catch (const Foam::error& err)
     {
         WarningInFunction
             << "Caught FatalError " << err << nl << endl;

applications/test/fileName/Test-fileName.C

@@ -601,9 +601,27 @@ int main(int argc, char *argv[])
         << " controlDict => " << findEtcFile("controlDict") << nl
         << " badName => " << findEtcFile("badName") << endl;
 
-    Info<< "This should emit a fatal error:" << endl;
+    {
-    Info<< " badName(die) => " << findEtcFile("badName", true) << nl
+
-        << endl;
+        Info<< nl << "Expect a FatalError for findEtcFile() with a bad name:"
+            << nl;
+
+        const bool throwingError = FatalError.throwExceptions();
+
+        try
+        {
+            Info<< " badName(die) => " << flush
+                << findEtcFile("<very-badName>", true) << nl
+                << endl;
+        }
+        catch (const Foam::error& err)
+        {
+            Info<< nl << "findEtcFile() Caught FatalError "
+                << err << nl << endl;
+        }
+        FatalError.throwExceptions(throwingError);
+    }
+
 
     Info<< "\nEnd\n" << endl;
     return 0;

applications/test/primitives/Test-primitives.C

@@ -75,7 +75,7 @@ unsigned testParsing
         {
             val = function (str);
         }
-        catch (Foam::error& err)
+        catch (const Foam::error& err)
         {
             parsed = false;
             errMsg = err.message();

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H

@@ -141,6 +141,13 @@ public:
         typedef indexedVertex<Gt,Vb2>                           Other;
     };
 
+
+    // Generated Methods
+
+        //- Copy construct
+        indexedVertex(const indexedVertex&) = default;
+
+
     // Constructors
 
         inline indexedVertex();

applications/utilities/mesh/manipulation/setSet/setSet.C

@@ -543,7 +543,7 @@ bool doCommand
             }
         }
     }
-    catch (Foam::IOerror& fIOErr)
+    catch (const Foam::IOerror& fIOErr)
     {
         ok = false;
 
@@ -554,7 +554,7 @@ bool doCommand
             Pout<< topoSetSource::usage(sourceType).c_str();
         }
     }
-    catch (Foam::error& fErr)
+    catch (const Foam::error& fErr)
     {
         ok = false;
 

applications/utilities/miscellaneous/foamHelp/foamHelp.C

@@ -57,11 +57,23 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    word utilityName = argv[1];
+    word utilityName(argv[1]);
-    Foam::autoPtr<Foam::helpType> utility
+    autoPtr<helpType> utility;
-    (
+
-        helpType::New(utilityName)
+    const bool throwing = FatalError.throwExceptions();
-    );
+    try
+    {
+        utility.reset(helpType::New(utilityName).ptr());
+    }
+    catch (const Foam::error& err)
+    {
+        utility.clear();
+
+        FatalError
+            << err.message().c_str() << nl
+            << exit(FatalError);
+    }
+    FatalError.throwExceptions(throwing);
 
     utility().init();
 

applications/utilities/parallelProcessing/reconstructPar/reconstructPar.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) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.

applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloud.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) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -74,7 +74,7 @@ bool writeCloudField
 template<class Type>
 bool writeCloudField
 (
-    const IOobject& fieldObject,
+    IOobject& fieldObject,
     const bool exists,
     autoPtr<ensightFile>& output
 );

applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloudTemplates.C

@@ -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) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,8 +36,8 @@ License
 template<class Type>
 bool Foam::ensightCloud::writeCloudField
 (
-    const Foam::IOField<Type>& field,
+    const IOField<Type>& field,
-    Foam::ensightFile& os
+    ensightFile& os
 )
 {
     const bool exists = (returnReduce(field.size(), sumOp<label>()) > 0);
@@ -125,14 +125,23 @@ bool Foam::ensightCloud::writeCloudField
 template<class Type>
 bool Foam::ensightCloud::writeCloudField
 (
-    const Foam::IOobject& fieldObject,
+    IOobject& fieldObject,
     const bool exists,
-    Foam::autoPtr<Foam::ensightFile>& output
+    autoPtr<ensightFile>& output
 )
 {
     if (exists)
     {
+        // when exists == true, it exists globally,
+        // but can still be missing on the local processor.
+        // Handle this by READ_IF_PRESENT instead.
+
+        const IOobject::readOption rOpt = fieldObject.readOpt();
+        fieldObject.readOpt() = IOobject::READ_IF_PRESENT;
+
         IOField<Type> field(fieldObject);
+        fieldObject.readOpt() = rOpt;
+
         writeCloudField(field, output.rawRef());
     }
 

applications/utilities/postProcessing/dataConversion/foamToEnsight/findCloudFields.H

@@ -7,7 +7,7 @@ HashTable<HashTable<word>> cloudFields;
 if (timeDirs.size() && !noLagrangian)
 {
     const fileName& baseDir = mesh.time().path();
-    const fileName& cloudPrefix = regionPrefix/cloud::prefix;
+    const fileName cloudPrefix(regionPrefix/cloud::prefix);
 
     Info<< "Searching for lagrangian ... " << flush;
 
@@ -35,11 +35,12 @@ if (timeDirs.size() && !noLagrangian)
                 cloudPrefix/cloudName
             );
 
-            // Clouds always have "positions" (v1706 and lower) or "coordinates"
+            // Clouds require "coordinates".
-            if (cloudObjs.found("positions") || cloudObjs.found("coordinates"))
+            // The "positions" are for v1706 and lower.
+            if (cloudObjs.found("coordinates") || cloudObjs.found("positions"))
             {
                 // Save the cloud fields on a per cloud basis
-                auto fieldsPerCloud = cloudFields(cloudName);
+                auto& fieldsPerCloud = cloudFields(cloudName);
 
                 forAllConstIters(cloudObjs, fieldIter)
                 {
@@ -59,6 +60,12 @@ if (timeDirs.size() && !noLagrangian)
         cloudIter().erase("positions");
     }
 
+    if (Pstream::parRun())
+    {
+        Pstream::mapCombineGather(cloudFields, HashTablePlusEqOp<word>());
+        Pstream::mapCombineScatter(cloudFields);
+    }
+
     if (cloudFields.empty())
     {
         Info<< "none detected." << endl;

applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C

@@ -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) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,6 +72,8 @@ Note
 #include "IOobjectList.H"
 #include "IOmanip.H"
 #include "OFstream.H"
+#include "PstreamCombineReduceOps.H"
+#include "HashTableOps.H"
 
 #include "fvc.H"
 #include "volFields.H"
@@ -622,8 +624,13 @@ int main(int argc, char *argv[])
 
             Info<< "Write " << cloudName << " (";
 
-            bool cloudExists = currentCloudDirs.found(cloudName);
+            const bool cloudExists =
-            reduce(cloudExists, orOp<bool>());
+                returnReduce
+                (
+                    currentCloudDirs.found(cloudName),
+                    orOp<bool>()
+                );
+
 
             {
                 autoPtr<ensightFile> os = ensCase.newCloud(cloudName);
@@ -643,10 +650,10 @@ int main(int argc, char *argv[])
                 }
             }
 
-            forAllConstIter(HashTable<word>, theseCloudFields, fieldIter)
+            forAllConstIters(theseCloudFields, fieldIter)
             {
                 const word& fieldName = fieldIter.key();
-                const word& fieldType = fieldIter();
+                const word& fieldType = fieldIter.object();
 
                 IOobject fieldObject
                 (
@@ -657,10 +664,13 @@ int main(int argc, char *argv[])
                     IOobject::MUST_READ
                 );
 
-                // cannot have field without cloud positions
+                bool fieldExists = cloudExists; // No field without positions
-                bool fieldExists = cloudExists;
                 if (cloudExists)
                 {
+                    // Want MUST_READ (globally) and valid=false (locally),
+                    // but that combination does not work.
+                    // So check the header and sync globally
+
                     fieldExists =
                         fieldObject.typeHeaderOk<IOField<scalar>>(false);
 

applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H

@@ -8,8 +8,8 @@ HashTable<HashTable<word>> cloudFields;
 
 if (timeDirs.size())
 {
-    const fileName& cloudPrefix = regionPrefix/cloud::prefix;
     const word& lastTimeName = timeDirs.last().name();
+    const fileName cloudPrefix(regionPrefix/cloud::prefix);
 
     IOobjectList objs(mesh, lastTimeName);
 
@@ -28,7 +28,7 @@ if (timeDirs.size())
 
 
     //
-    // now check for lagrangian/<cloudName>
+    // Now check for lagrangian/<cloudName>
     //
     fileNameList cloudDirs;
     if (!noLagrangian)
@@ -46,48 +46,45 @@ if (timeDirs.size())
     {
         const word& cloudName = cloudDirs[cloudI];
 
-        // Create a new hash table for each cloud
+        IOobjectList cloudObjs
-        cloudFields.insert(cloudName, HashTable<word>());
-
-        // Identify the new cloud within the hash table
-        HashTable<HashTable<word>>::iterator cloudIter =
-            cloudFields.find(cloudName);
-
-        IOobjectList objs
         (
             mesh,
             lastTimeName,
             cloudPrefix/cloudName
         );
 
-        bool hasCoordinates = false;
+        // Clouds require "coordinates".
-        forAllConstIter(IOobjectList, objs, fieldIter)
+        // The "positions" are for v1706 and lower.
+        if (cloudObjs.found("coordinates") || cloudObjs.found("positions"))
         {
-            const IOobject obj = *fieldIter();
+            // Save the cloud fields on a per cloud basis
-            const word& fieldName = obj.name();
+            auto& fieldsPerCloud = cloudFields(cloudName);
-            const word& fieldType = obj.headerClassName();
 
-            if (fieldName == "positions" || fieldName == "coordinates")
+            forAllConstIters(cloudObjs, fieldIter)
             {
-                hasCoordinates = true;
+                const IOobject* obj = fieldIter();
-            }
-            else if (cloudFieldTypes.found(fieldType))
-            {
-                // simply ignore types that we don't handle
-                cloudIter().insert(fieldName, fieldType);
-            }
-        }
 
-        // drop this cloud if it has no positions or is otherwise empty
+                const word& fieldName = obj->name();
-        if (!hasCoordinates || cloudIter().empty())
+                const word& fieldType = obj->headerClassName();
-        {
+
-            Info<< "removing cloud " << cloudName << endl;
+                if (cloudFieldTypes.found(fieldType))
-            cloudFields.erase(cloudIter);
+                {
+                    // Field name/type - ignore types that we don't handle
+                    fieldsPerCloud.insert(fieldName, fieldType);
+                }
+            }
         }
     }
 
+    // Only retain a cloud that actually has fields
+    cloudFields.filterValues
+    (
+        [](const HashTable<word>& v){ return v.size(); }
+    );
+
+
     //
-    // verify that the variable is present for all times
+    // Verify that the variable is present for all times
     //
     for (label i=0; volumeFields.size() && i < timeDirs.size(); ++i)
     {
@@ -114,3 +111,6 @@ if (timeDirs.size())
         volumeFields.erase(missing);
     }
 }
+
+
+// ************************************************************************* //

applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C

@@ -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) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -275,10 +275,10 @@ int main(int argc, char *argv[])
 
         Info<< "Write volume field (" << flush;
 
-        forAllConstIter(HashTable<word>, volumeFields, fieldIter)
+        forAllConstIters(volumeFields, fieldIter)
         {
             const word& fieldName = fieldIter.key();
-            const word& fieldType = fieldIter();
+            const word& fieldType = fieldIter.object();
 
             IOobject fieldObject
             (
@@ -364,10 +364,12 @@ int main(int argc, char *argv[])
         Info<< " )" << endl;
 
         // Check for clouds
-        forAllConstIter(HashTable<HashTable<word>>, cloudFields, cloudIter)
+        forAllConstIters(cloudFields, cloudIter)
         {
             const word& cloudName = cloudIter.key();
-            const fileName& cloudPrefix = regionPrefix/cloud::prefix;
+            const HashTable<word>& theseCloudFields = cloudIter.object();
+
+            const fileName cloudPrefix(regionPrefix/cloud::prefix);
 
             if (!isDir(runTime.timePath()/cloudPrefix/cloudName))
             {
@@ -381,13 +383,15 @@ int main(int argc, char *argv[])
                 cloudPrefix/cloudName
             );
 
-            // Check that the positions/coordinates field is present for this
+            // Clouds require "coordinates".
-            // time
+            // The "positions" are for v1706 and lower.
-            if
+            const bool cloudExists =
             (
-                !cloudObjs.found("positions")
+                cloudObjs.found("coordinates")
-             || !cloudObjs.found("coordinates")
+             || cloudObjs.found("positions")
-            )
+            );
+
+            if (!cloudExists)
             {
                 continue;
             }
@@ -403,18 +407,17 @@ int main(int argc, char *argv[])
             Info<< " positions";
 
 
-            forAllConstIter(HashTable<word>, cloudIter(), fieldIter)
+            forAllConstIters(theseCloudFields, fieldIter)
             {
                 const word& fieldName = fieldIter.key();
-                const word& fieldType = fieldIter();
+                const word& fieldType = fieldIter.object();
 
                 IOobject *fieldObject = cloudObjs.lookup(fieldName);
 
                 if (!fieldObject)
                 {
                     Info<< "missing "
-                        << runTime.timeName()/cloudPrefix/cloudName
+                        << runTime.timeName()/cloudPrefix/cloudName/fieldName
-                        / fieldName
                         << endl;
                     continue;
                 }

applications/utilities/postProcessing/dataConversion/foamToVTK/findClouds.H

@@ -1,12 +1,12 @@
 // check all time directories for the following:
 
 // Any cloud names:
-HashSet<fileName> allCloudDirs;
+HashSet<word> allCloudDirs;
 
 if (timeDirs.size() && !noLagrangian)
 {
     const fileName& baseDir = mesh.time().path();
-    const fileName& cloudPrefix = regionPrefix/cloud::prefix;
+    const fileName cloudPrefix(regionPrefix/cloud::prefix);
 
     Info<< "Searching for lagrangian ... " << flush;
 
@@ -32,14 +32,15 @@ if (timeDirs.size() && !noLagrangian)
                 cloudPrefix/cloudName
             );
 
-            // Clouds always require "positions"/"coordinates"
+            // Clouds require "coordinates".
-            if (cloudObjs.found("positions") || cloudObjs.found("coordinates"))
+            // The "positions" are for v1706 and lower.
+            if (cloudObjs.found("coordinates") || cloudObjs.found("positions"))
             {
                 if (allCloudDirs.insert(cloudName))
                 {
-                    Info<< "At time: " << timeName
+                    Info<< nl << "    At time: " << timeName
                         << " detected cloud directory : " << cloudName
-                        << endl;
+                        << flush;
                 }
             }
         }
@@ -49,14 +50,21 @@ if (timeDirs.size() && !noLagrangian)
     {
         Info<< "none detected." << endl;
     }
+
+    if (Pstream::parRun())
+    {
+        Pstream::combineGather(allCloudDirs, HashSetPlusEqOp<word>());
+        Pstream::combineScatter(allCloudDirs);
+    }
 }
 
-// sorted list of cloud names
+
-const fileNameList cloudNames(allCloudDirs.sortedToc());
+// Sorted list of cloud names
+const wordList cloudNames(allCloudDirs.sortedToc());
 
 if (cloudNames.size())
 {
-    // complete the echo information
+    // Complete the echo information
     Info<< "(";
     for (const word& cloudName : cloudNames)
     {

applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C

@@ -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) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -146,6 +146,8 @@ Note
 #include "pointMesh.H"
 #include "volPointInterpolation.H"
 #include "emptyPolyPatch.H"
+#include "PstreamCombineReduceOps.H"
+#include "HashTableOps.H"
 #include "labelIOField.H"
 #include "scalarIOField.H"
 #include "sphericalTensorIOField.H"
@@ -156,7 +158,6 @@ Note
 #include "passiveParticle.H"
 #include "stringOps.H"
 #include "areaFields.H"
-
 #include "meshSubsetHelper.H"
 #include "readFields.H"
 #include "faceSet.H"
@@ -190,13 +191,17 @@ void print(const char* msg, Ostream& os, const UPtrList<const GeoField>& flds)
 }
 
 
-void print(Ostream& os, const wordList& flds)
+void print(const char* msg, Ostream& os, const wordList& flds)
 {
-    forAll(flds, i)
+    if (flds.size())
     {
-        os  << ' ' << flds[i];
+        os  << msg;
+        forAll(flds, i)
+        {
+            os  << ' ' << flds[i];
+        }
+        os  << endl;
     }
-    os  << endl;
 }
 
 
@@ -617,6 +622,16 @@ int main(int argc, char *argv[])
         pointTensorField::typeName
     };
 
+    // Supported cloud (lagrangian) field types
+    const wordHashSet cFieldTypes
+    {
+        labelIOField::typeName,
+        scalarIOField::typeName,
+        vectorIOField::typeName,
+        symmTensorIOField::typeName,
+        tensorIOField::typeName
+    };
+
     forAll(timeDirs, timei)
     {
         runTime.setTime(timeDirs[timei], timei);
@@ -879,7 +894,7 @@ int main(int argc, char *argv[])
                 {
                     aMeshPtr.reset(new faMesh(meshRef.baseMesh()));
                 }
-                catch (Foam::error& err)
+                catch (const Foam::error& err)
                 {
                     aMeshPtr.clear();
                 }
@@ -1446,7 +1461,7 @@ int main(int argc, char *argv[])
         //
         //---------------------------------------------------------------------
 
-        for (const fileName& cloudName : cloudNames)
+        for (const word& cloudName : cloudNames)
         {
             // Always create the cloud directory.
             mkDir(fvPath/cloud::prefix/cloudName);
@@ -1459,50 +1474,84 @@ int main(int argc, char *argv[])
             Info<< "    Lagrangian: "
                 << relativeName(runTime, outputName) << nl;
 
-            IOobjectList sprayObjs
+            IOobjectList cloudObjs
             (
                 mesh,
                 runTime.timeName(),
                 cloud::prefix/cloudName
             );
 
-            if (sprayObjs.found("positions") || sprayObjs.found("coordinates"))
+            // Clouds require "coordinates".
+            // The "positions" are for v1706 and lower.
+            bool cloudExists =
+            (
+                cloudObjs.found("coordinates")
+             || cloudObjs.found("positions")
+            );
+            reduce(cloudExists, orOp<bool>());
+
+            if (cloudExists)
             {
-                wordList labelNames(sprayObjs.names(labelIOField::typeName));
+                // Limited to types that we explicitly handle
-                Info<< "        labels      :";
+                HashTable<wordHashSet> cloudFields = cloudObjs.classes();
-                print(Info, labelNames);
+                cloudFields.retain(cFieldTypes);
 
-                wordList scalarNames(sprayObjs.names(scalarIOField::typeName));
+                // The number of cloud fields (locally)
-                Info<< "        scalars     :";
+                label nCloudFields = 0;
-                print(Info, scalarNames);
+                forAllConstIters(cloudFields, citer)
+                {
+                    nCloudFields += citer.object().size();
+                }
 
-                wordList vectorNames(sprayObjs.names(vectorIOField::typeName));
+                // Ensure all processes have identical information
-                Info<< "        vectors     :";
+                if (Pstream::parRun())
-                print(Info, vectorNames);
+                {
-
+                    Pstream::mapCombineGather
-                wordList sphereNames
-                (
-                    sprayObjs.names
                     (
-                        sphericalTensorIOField::typeName
+                        cloudFields,
-                    )
+                        HashSetPlusEqOp<word>()
-                );
+                    );
-                Info<< "        sphTensors  :";
+                    Pstream::mapCombineScatter(cloudFields);
-                print(Info, sphereNames);
+                }
 
-                wordList symmNames
+
+                // Build lists of field names and echo some information
+
+                const wordList labelNames
                 (
-                    sprayObjs.names
+                    cloudFields(labelIOField::typeName).sortedToc()
-                    (
-                        symmTensorIOField::typeName
-                    )
                 );
-                Info<< "        symmTensors :";
+                print("        labels      :", Info, labelNames);
-                print(Info, symmNames);
 
-                wordList tensorNames(sprayObjs.names(tensorIOField::typeName));
+                const wordList scalarNames
-                Info<< "        tensors     :";
+                (
-                print(Info, tensorNames);
+                    cloudFields(scalarIOField::typeName).sortedToc()
+                );
+                print("        scalars     :", Info, scalarNames);
+
+                const wordList vectorNames
+                (
+                    cloudFields(vectorIOField::typeName).sortedToc()
+                );
+                print("        vectors     :", Info, vectorNames);
+
+                const wordList sphNames
+                (
+                    cloudFields(sphericalTensorIOField::typeName).sortedToc()
+                );
+                print("        sphTensors  :", Info, sphNames);
+
+                const wordList symmNames
+                (
+                    cloudFields(symmTensorIOField::typeName).sortedToc()
+                );
+                print("        symmTensors :", Info, symmNames);
+
+                const wordList tensorNames
+                (
+                    cloudFields(tensorIOField::typeName).sortedToc()
+                );
+                print("        tensors     :", Info, tensorNames);
 
                 vtk::lagrangianWriter writer
                 (
@@ -1512,22 +1561,14 @@ int main(int argc, char *argv[])
                     fmtType
                 );
 
-                // Write number of fields
+                // Write number of fields (on this processor)
-                writer.beginParcelData
+                writer.beginParcelData(nCloudFields);
-                (
-                    labelNames.size()
-                  + scalarNames.size()
-                  + vectorNames.size()
-                  + sphereNames.size()
-                  + symmNames.size()
-                  + tensorNames.size()
-                );
 
                 // Fields
                 writer.writeIOField<label>(labelNames);
                 writer.writeIOField<scalar>(scalarNames);
                 writer.writeIOField<vector>(vectorNames);
-                writer.writeIOField<sphericalTensor>(sphereNames);
+                writer.writeIOField<sphericalTensor>(sphNames);
                 writer.writeIOField<symmTensor>(symmNames);
                 writer.writeIOField<tensor>(tensorNames);
 

applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.C

@@ -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) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,7 +65,8 @@ void Foam::vtk::lagrangianWriter::writePoints()
     }
     else
     {
-        beginPiece(); // Tricky - hide in here
+        beginPiece();           // Tricky - hide begin piece in here
+        if (!nParcels_) return; // No parcels? ... skip everything else
 
         format().tag(vtk::fileTag::POINTS)
             .openDataArray<float,3>(vtk::dataArrayAttr::POINTS)
@@ -219,16 +220,12 @@ Foam::vtk::lagrangianWriter::lagrangianWriter
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::vtk::lagrangianWriter::~lagrangianWriter()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::vtk::lagrangianWriter::beginParcelData(label nFields)
 {
+    if (!nParcels_) return;   // Skip if there are no parcels
+
     const vtk::fileTag dataType =
     (
         useVerts_
@@ -249,6 +246,8 @@ void Foam::vtk::lagrangianWriter::beginParcelData(label nFields)
 
 void Foam::vtk::lagrangianWriter::endParcelData()
 {
+    if (!nParcels_) return;   // Skip if there are no parcels
+
     const vtk::fileTag dataType =
     (
         useVerts_

applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.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) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,7 +25,7 @@ Class
     Foam::vtk::lagrangianWriter
 
 Description
-    Write fields (internal).
+    Write lagrangian positions and fields (clouds).
 
 SourceFiles
     lagrangianWriter.C
@@ -36,11 +36,11 @@ SourceFiles
 #ifndef foamVtkLagrangianWriter_H
 #define foamVtkLagrangianWriter_H
 
-#include "OFstream.H"
 #include "Cloud.H"
 #include "volFields.H"
 #include "pointFields.H"
 #include "foamVtkOutputOptions.H"
+#include <fstream>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -115,7 +115,7 @@ public:
 
 
     //- Destructor
-    ~lagrangianWriter();
+    ~lagrangianWriter() = default;
 
 
     // Member Functions
@@ -135,15 +135,17 @@ public:
             return nParcels_;
         }
 
+        //- Begin parcel data (point data).
+        //  The nFields parameter is only needed for legacy format.
         void beginParcelData(label nFields);
         void endParcelData();
 
         //- Write file footer
         void writeFooter();
 
-        //- Write IOField
+        //- Write IOFields
         template<class Type>
-        void writeIOField(const wordList& objectNames);
+        void writeIOField(const wordList& fieldNames);
 };
 
 

applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriterTemplates.C

@@ -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) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,30 +29,48 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::vtk::lagrangianWriter::writeIOField
+void Foam::vtk::lagrangianWriter::writeIOField(const wordList& fieldNames)
-(
-    const wordList& objectNames
-)
 {
     const int nCmpt(pTraits<Type>::nComponents);
 
     const bool useIntField =
         std::is_integral<typename pTraits<Type>::cmptType>();
 
-    for (const word& fldName : objectNames)
+    const fileName cloudDir(cloud::prefix/cloudName_);
+
+    for (const word& fldName : fieldNames)
     {
-        IOobject header
+        // Globally the field is expected to exist (MUST_READ), but can
+        // be missing on a local processor.
+        //
+        // However, constructing IOField with MUST_READ and valid=false fails.
+        // Workaround: READ_IF_PRESENT and verify the header globally
+
+        IOobject fieldObject
         (
             fldName,
             mesh_.time().timeName(),
-            cloud::prefix/cloudName_,
+            cloudDir,
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::READ_IF_PRESENT
-            IOobject::NO_WRITE,
-            false  // no register
         );
 
-        IOField<Type> fld(header);
+        // Check global existence - could make an error
+        const bool fieldExists =
+            returnReduce
+            (
+                fieldObject.typeHeaderOk<IOField<Type>>(false),
+                orOp<bool>()
+            );
+
+        if (!fieldExists)
+        {
+            continue;
+        }
+
+        IOField<Type> fld(fieldObject);
+
+        // NOTE: Could skip if there are no local parcels...
 
         if (useIntField)
         {

applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.C

@@ -310,6 +310,9 @@ Foam::vtkPVFoam::vtkPVFoam
         fullCasePath = cwd();
     }
 
+    // OPENFOAM API
+    setEnv("FOAM_API", std::to_string(OPENFOAM_PLUS), true);
+
     // The name of the executable, unless already present in the environment
     setEnv("FOAM_EXECUTABLE", "paraview", false);
 

applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.C

@@ -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-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -206,6 +206,9 @@ Foam::vtkPVblockMesh::vtkPVblockMesh
         fullCasePath = cwd();
     }
 
+    // OPENFOAM API
+    setEnv("FOAM_API", std::to_string(OPENFOAM_PLUS), true);
+
     // The name of the executable, unless already present in the environment
     setEnv("FOAM_EXECUTABLE", "paraview", false);
 

applications/utilities/postProcessing/noise/noise.C

@@ -55,8 +55,8 @@ Usage
         }
 
 
-        // Input file
+        // Input files list
-        inputFile   "postProcessing/faceSource1/surface/patch/patch.case";
+        files       ("postProcessing/faceSource1/surface/patch/patch.case";)
 
         // Surface reader
         reader      ensight;

applications/utilities/postProcessing/postProcess/postProcess.C

@@ -217,9 +217,9 @@ int main(int argc, char *argv[])
             // Report to output (avoid overwriting values from simulation)
             profiling::print(Info);
         }
-        catch (Foam::IOerror& err)
+        catch (const Foam::IOerror& err)
         {
-            Warning<< err << endl;
+            Warning << err << endl;
         }
 
         Info<< endl;

bin/foamEtcFile

@@ -3,9 +3,11 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2008-2011, 2017-2018 OpenCFD Ltd.
-#    \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+#    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
+#                           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
 #     <http://www.gnu.org/licenses/>.
@@ -46,7 +48,7 @@
 printHelp() {
     cat<<USAGE
 
-Usage: foamEtcFile [OPTION] fileName
+Usage: foamEtcFile [OPTION] fileName [-- args]
        foamEtcFile [OPTION] [-list|-list-test] [fileName]
 
 options:
@@ -56,10 +58,15 @@ options:
   -mode=MODE        Any combination of u(user), g(group), o(other)
   -prefix=DIR       Specify an alternative installation prefix
   -version=VER      Specify alternative OpenFOAM version (eg, 3.0, 1612, ...)
-  -csh              Produce output suitable for a csh or sh 'eval'
+  -csh              Produce 'source FILE' output for a csh eval
-  -csh-verbose      As per -csh with additional verbosity
+  -sh               Produce '. FILE' output for a sh eval
-  -sh               Produce output suitable for a csh or sh 'eval'
+  -csh-verbose      As per -csh, with additional verbosity
-  -sh-verbose       As per -sh  with additional verbosity
+  -sh-verbose       As per -sh,  with additional verbosity
+  -config           Add config directory prefix for shell type:
+                        with -csh* for a config.csh/ prefix
+                        with -sh*  for a config.sh/ prefix
+  -show-api         Print api value from wmake/rules, or meta-info and exit
+  -show-patch       Print patch value from meta-info and exit
   -quiet (-q)       Suppress all normal output
   -silent (-s)      Suppress stderr, except -csh-verbose, -sh-verbose output
   -help             Print the usage
@@ -81,7 +88,6 @@ USAGE
     exit 0  # A clean exit
 }
 
-
 unset optQuiet optSilent
 # Report error and exit
 die()
@@ -182,8 +188,65 @@ setVersion()
 }
 
 
+#-------------------------------------------------------------------------------
+
+# The API locations. See wmake/wmakeBuildInfo
+rulesFile="$projectDir/wmake/rules/General/general"
+metaInfoDir="$projectDir/META-INFO"
+
+# Get api from rules/General/general
+#
+# Failure modes:
+# - No api information (can't find file etc).
+#   -> Fatal for building, but could be OK for a stripped down version
+#
+# Fallback. Get from api-info
+#
+getApi()
+{
+    local value
+
+    value="$(sed -ne '/^ *#/!{ /WM_VERSION.*OPENFOAM=/{ s@^.*OPENFOAM= *\([0-9][0-9]*\).*@\1@p; q }}' $rulesFile 2>/dev/null)"
+    if [ -z "$value" ] && [ -f "$metaInfoDir/api-info" ]
+    then
+        # Fallback. Get from api-info
+        value="$(sed -ne 's@^ *api *= *\([0-9][0-9]*\).*@\1@p' $metaInfoDir/api-info 2>/dev/null)"
+    fi
+
+    if [ -n "$value" ]
+    then
+        echo "$value"
+    else
+        return 1
+    fi
+}
+
+
+# Get patch from meta-info / api-info
+#
+# Failure modes:
+# - No patch information (can't find file etc).
+#
+getPatchLevel()
+{
+    local value
+
+    # Fallback. Get from api-info
+    value="$(sed -ne 's@^ *patch *= *\([0-9][0-9]*\).*@\1@p' $metaInfoDir/api-info 2>/dev/null)"
+
+    if [ -n "$value" ]
+    then
+        echo "$value"
+    else
+        return 1
+    fi
+}
+
+
+#-------------------------------------------------------------------------------
 optMode=ugo         # Default mode is always 'ugo'
-unset optAll optList optShell optVersion
+unset shellOutput verboseOutput
+unset optAll optConfig optList optVersion
 
 # Parse options
 while [ "$#" -gt 0 ]
@@ -192,21 +255,36 @@ do
     -h | -help*)
         printHelp
         ;;
+    -show-api)
+        # Show API and exit
+        getApi
+        exit $?
+        ;;
+    -show-patch)
+        # Show patch level and exit
+        getPatchLevel
+        exit $?
+        ;;
     -a | -all)
         optAll=true
-        unset optShell
+        unset shellOutput verboseOutput
         ;;
     -l | -list)
         optList=true
-        unset optShell
         ;;
     -list-test)
         optList='test'
-        unset optShell
         ;;
-    -csh | -sh | -csh-verbose | -sh-verbose)
+    -csh | -sh)
-        optShell="${1#-}"
+        shellOutput="${1#-}"
-        unset optAll
+        unset verboseOutput
+        ;;
+    -csh-verbose | -sh-verbose)
+        shellOutput="${1#-}"
+        verboseOutput="source "         # Report: "source FILE"
+        ;;
+    -config)
+        optConfig=true
         ;;
     -mode=[ugo]*)
         optMode="${1#*=}"
@@ -260,9 +338,33 @@ do
     shift
 done
 
-
 #-------------------------------------------------------------------------------
 
+# Split arguments into filename (for searching) and trailing bits for shell eval
+# Silently remove leading ~OpenFOAM/ (as per Foam::findEtcFile)
+nArgs=$#
+fileName="${1#~OpenFOAM/}"
+unset evalArgs
+
+if [ "$nArgs" -eq 1 ]
+then
+    if [ "$1" = "--" ]
+    then
+        nArgs=0
+        unset fileName
+    fi
+elif [ "$nArgs" -ge 2 ]
+then
+    if [ "$2" = "--" ]
+    then
+        nArgs=1
+        shift 2
+        evalArgs="$@"
+    fi
+fi
+
+
+# Get version information
 if [ -n "$optVersion" ]
 then
     setVersion $optVersion
@@ -285,12 +387,6 @@ groupDir="${WM_PROJECT_SITE:-$prefixDir/site}"
 #     eval echo "$i=\$$i" 1>&2
 # done
 
-
-# Save the essential bits of information
-# silently remove leading ~OpenFOAM/ (used in Foam::findEtcFile)
-nArgs=$#
-fileName="${1#~OpenFOAM/}"
-
 # Define the various places to be searched:
 unset dirList
 case "$optMode" in (*u*) # (U)ser
@@ -309,27 +405,61 @@ case "$optMode" in (*o*) # (O)ther == shipped
 esac
 set -- $dirList
 
+[ "$#" -ge 1 ] || die "No directories to scan. Programming error?"
+exitCode=2  # Fallback is a FileNotFound error
+
+
+#
+# Preliminaries
+#
+
+# Special handling of config.sh/ , config.csh/ directories
+if [ -n "$optConfig" -a -n "$shellOutput" -a -n "$fileName" ]
+then
+    case "$shellOutput" in
+    csh*)
+        optConfig="config.csh/"
+        ;;
+    sh*)
+        optConfig="config.sh/"
+        ;;
+    *)
+        unset optConfig
+        ;;
+    esac
+
+    if [ -n "$optConfig" ]
+    then
+        case "$fileName" in
+        /* | config.csh* | config.sh*)
+            # Does not need or cannot add a prefix
+            unset optConfig
+            ;;
+        *)
+            fileName="$optConfig$fileName"
+            ;;
+        esac
+    fi
+fi
+
 
 #
 # The main routine
 #
 
-exitCode=0
 if [ -n "$optList" ]
 then
 
     # List directories, or potential file locations
     [ "$nArgs" -le 1 ] || \
-    die "-list expects 0 or 1 filename, but $nArgs provided"
+        die "-list options expect 0 or 1 filename, but $nArgs provided"
 
-    # A silly combination, but -quiet does have precedence
+    # A silly combination, but -quiet has absolute precedence
     [ -n "$optQuiet" ] && exit 0
 
     # Test for directory or file too?
     if [ "$optList" = "test" ]
     then
-        exitCode=2  # Fallback to a general error (file not found)
-
         if [ "$nArgs" -eq 1 ]
         then
             for dir
@@ -352,6 +482,7 @@ then
             done
         fi
     else
+        exitCode=0  # OK, already verified that $# != 0
         for dir
         do
             echo "$dir${fileName:+/}$fileName"
@@ -362,35 +493,44 @@ else
 
     [ "$nArgs" -eq 1 ] || die "One filename expected - $nArgs provided"
 
-    exitCode=2  # Fallback to a general error (file not found)
+    # Output for sourcing files ("source" for csh, "." for POSIX shell)
+    # Only allow sourcing a single file (disallow combination with -all)
+    case "$shellOutput" in
+    csh*)
+        shellOutput="source "   # eg, "source FILE"
+        ;;
+    sh*)
+        shellOutput=". "        # eg, ". FILE"
+        ;;
+    esac
+
+    # Anti-pattern: -all disables shell commands
+    if [ -n "$optAll" ]
+    then
+        unset shellOutput verboseOutput
+    fi
 
     for dir
     do
-        if [ -f "$dir/$fileName" ]
+        resolved="$dir/$fileName"
+        if [ -f "$resolved" ]
         then
-            exitCode=0
+            exitCode=0  # OK
-            [ -n "$optQuiet" ] && break
+            if [ -n "$optQuiet" ]
-
+            then
-            case "$optShell" in
-            (*verbose)
-                echo "Using: $dir/$fileName" 1>&2
-                ;;
-            esac
-
-            case "$optShell" in
-            csh*)
-                echo "source $dir/$fileName"
                 break
-                ;;
+            elif [ -n "$verboseOutput" ]
-            sh*)
+            then
-                echo ". $dir/$fileName"
+                echo "$verboseOutput$resolved" 1>&2
-                break
+            fi
-                ;;
+
-            *)
+            if [ -n "$shellOutput" ]
-                echo "$dir/$fileName"
+            then
-                [ -n "$optAll" ] || break
+                echo "$shellOutput$resolved $evalArgs"
-                ;;
+            else
-            esac
+                echo "$resolved"
+            fi
+            [ -n "$optAll" ] || break
         fi
     done
 

bin/tools/foamConfigurePaths

@@ -4,7 +4,7 @@
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+#    \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@@ -36,7 +36,8 @@ usage: ${0##*/}
   -boost-path DIR         specify 'BOOST_ARCH_PATH'
   -cgal ver               specify 'cgal_version'
   -cgal-path DIR          specify 'CGAL_ARCH_PATH'
-  -clang VER              specify 'clang_version' for ThirdParty Clang
+  -clang VER              specify 'default_clang_version' for ThirdParty Clang
+  -gcc VER                specify 'default_gcc_version' for ThirdParty Gcc
   -cmake VER              specify 'cmake_version'
   -fftw VER               specify 'fffw_version'
   -fftw-path DIR          specify 'FFTW_ARCH_PATH'
@@ -325,9 +326,17 @@ do
         ;;
 
     -clang)
-        # Replace clang_version=...
+        # Replace default_clang_version=...
         [ "$#" -ge 2 ] || die "'$1' option requires an argument"
-        replace etc/config.sh/compiler  clang_version "$2"
+        replace etc/config.sh/compiler  default_clang_version "$2"
+        adjusted=true
+        shift
+        ;;
+
+    -gcc)
+        # Replace default_gcc_version=...
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        replace etc/config.sh/compiler  default_gcc_version "$2"
         adjusted=true
         shift
         ;;
@@ -466,19 +475,19 @@ do
 
     gmp-[4-9]* | gmp-system)
         # gcc-related package
-        replace etc/config.sh/compiler  gmp_version "$1"
+        replace etc/config.sh/compiler  default_gmp_version "$1"
         adjusted=true
         ;;
 
     mpfr-[2-9]* | mpfr-system)
         # gcc-related package
-        replace etc/config.sh/compiler  mpfr_version "$1"
+        replace etc/config.sh/compiler  default_mpfr_version "$1"
         adjusted=true
         ;;
 
     mpc-[0-9]* | mpc-system)
         # gcc-related package
-        replace etc/config.sh/compiler  mpc_version "$1"
+        replace etc/config.sh/compiler  default_mpc_version "$1"
         adjusted=true
         ;;
 

etc/bashrc

@@ -33,7 +33,7 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-export WM_PROJECT_VERSION=plus
+export WM_PROJECT_VERSION=v1712
 
 # [FOAM_INST_DIR] - parent directory containing the OpenFOAM installation.
 # \- When this file is located as $WM_PROJECT_DIR/etc/bashrc, the next lines

etc/config.csh/compiler

@@ -2,12 +2,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+#   \\  /    A nd           | www.openfoam.com
-#    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
-#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.csh/compiler
@@ -20,67 +22,117 @@
 
 switch ("$WM_COMPILER_TYPE")
 case ThirdParty:
-    # Default versions of GMP, MPFR, MPC - override as necessary
+    # Default versions (CLANG, GCC, GMP, MPFR, MPC) - override as necessary
-    set gmp_version=gmp-system
+
-    set mpfr_version=mpfr-system
+    set default_clang_version=llvm-3.7.1
-    set mpc_version=mpc-system
+    set default_gcc_version=gcc-4.8.5
+
+    set default_gmp_version=gmp-system
+    set default_mpfr_version=mpfr-system
+    set default_mpc_version=mpc-system
 
     switch ("$WM_COMPILER")
     case Gcc:
-    case Gcc48:
+        set gcc_version="$default_gcc_version"
+        breaksw
+    case Gcc48*:
         set gcc_version=gcc-4.8.5
         breaksw
-    case Gcc49:
+    case Gcc49*:
         set gcc_version=gcc-4.9.4
         breaksw
-    case Gcc51:
+    case Gcc51*:
         set gcc_version=gcc-5.1.0
         breaksw
-    case Gcc52:
+    case Gcc52*:
         set gcc_version=gcc-5.2.0
         breaksw
-    case Gcc53:
+    case Gcc53*:
         set gcc_version=gcc-5.3.0
         breaksw
-    case Gcc54:
+    case Gcc54*:
         set gcc_version=gcc-5.4.0
         breaksw
-    case Gcc55:
+    case Gcc55*:
         set gcc_version=gcc-5.5.0
         breaksw
-    case Gcc61:
+    case Gcc61*:
         set gcc_version=gcc-6.1.0
         breaksw
-    case Gcc62:
+    case Gcc62*:
         set gcc_version=gcc-6.2.0
         breaksw
-    case Gcc63:
+    case Gcc63*:
         set gcc_version=gcc-6.3.0
         breaksw
-    case Gcc64:
+    case Gcc64*:
         set gcc_version=gcc-6.4.0
         breaksw
-    case Gcc71:
+    case Gcc65*:
+        set gcc_version=gcc-6.5.0
+        breaksw
+    case Gcc71*:
         set gcc_version=gcc-7.1.0
         breaksw
-    case Gcc72:
+    case Gcc72*:
         set gcc_version=gcc-7.2.0
         breaksw
+    case Gcc73*:
+        set gcc_version=gcc-7.3.0
+        breaksw
+    case Gcc74*:
+        set gcc_version=gcc-7.4.0
+        breaksw
+    case Gcc81*:
+        set gcc_version=gcc-8.1.0
+        breaksw
+    case Gcc82*:
+        set gcc_version=gcc-8.2.0
+        breaksw
+    case Gcc83*:
+        set gcc_version=gcc-8.3.0
+        breaksw
+    case Gcc91*:
+        set gcc_version=gcc-9.1.0
+        breaksw
+    case Gcc92*:
+        set gcc_version=gcc-9.2.0
+        breaksw
+
     case Clang:
+        set clang_version="$default_clang_version"
+        breaksw
+    case Clang37*:
         set clang_version=llvm-3.7.1
         breaksw
-    case Clang38:
+    case Clang38*:
         set clang_version=llvm-3.8.1
         breaksw
-    case Clang39:
+    case Clang39*:
         set clang_version=llvm-3.9.1
         breaksw
-    case Clang40:
+    case Clang40*:
         set clang_version=llvm-4.0.1
         breaksw
-    case Clang50:
+    case Clang50*:
-        set clang_version=llvm-5.0.0
+        set clang_version=llvm-5.0.2
         breaksw
+    case Clang60*:
+        set clang_version=llvm-6.0.1
+        breaksw
+    case Clang70*:
+        set clang_version=llvm-7.0.1
+        breaksw
+    case Clang71*:
+        set clang_version=llvm-7.1.0
+        breaksw
+    case Clang80*:
+        set clang_version=llvm-8.0.1
+        breaksw
+    case Clang90*:
+        set clang_version=llvm-9.0.0
+        breaksw
+
     default:
         /bin/cat << UNKNOWN_COMPILER
 ===============================================================================
@@ -92,7 +144,11 @@ Please check your settings
 UNKNOWN_COMPILER
         breaksw
     endsw
+
     breaksw
 endsw
 
+unset default_gcc_version default_clang_version
+unset default_gmp_version default_mpfr_version default_mpc_version
+
 #------------------------------------------------------------------------------

etc/config.csh/unset

@@ -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) 2016-2017 OpenCFD Ltd.
+#    \\/     M anipulation  | Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@@ -72,6 +72,7 @@ unsetenv WM_THIRD_PARTY_DIR
 #------------------------------------------------------------------------------
 # Unset FOAM_* environment variables
 
+unsetenv FOAM_API
 unsetenv FOAM_APPBIN
 unsetenv FOAM_APP
 unsetenv FOAM_CODE_TEMPLATES

etc/config.sh/compiler

@@ -2,12 +2,14 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#   \\  /    A nd           | www.openfoam.com
-#    \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2016-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
-#     <http://www.gnu.org/licenses/>.
 #
 # File
 #     etc/config.sh/compiler
@@ -20,66 +22,56 @@
 
 case "$WM_COMPILER_TYPE" in
 ThirdParty)
-    # Default versions of GMP, MPFR, MPC - override as necessary
+    # Default versions (CLANG, GCC, GMP, MPFR, MPC) - override as necessary
-    gmp_version=gmp-system
+
-    mpfr_version=mpfr-system
+    default_clang_version=llvm-3.7.1
-    mpc_version=mpc-system
+    default_gcc_version=gcc-4.8.5
+
+    default_gmp_version=gmp-system
+    default_mpfr_version=mpfr-system
+    default_mpc_version=mpc-system
+
+    gmp_version="$default_gmp_version"
+    mpfr_version="$default_mpfr_version"
+    mpc_version="$default_mpc_version"
 
     case "$WM_COMPILER" in
-    Gcc | Gcc48)
+    Gcc)    gcc_version="$default_gcc_version" ;;
-        gcc_version=gcc-4.8.5
+    Gcc48*) gcc_version=gcc-4.8.5 ;;
-        ;;
+    Gcc49*) gcc_version=gcc-4.9.4 ;;
-    Gcc49)
+    Gcc51*) gcc_version=gcc-5.1.0 ;;
-        gcc_version=gcc-4.9.4
+    Gcc52*) gcc_version=gcc-5.2.0 ;;
-        ;;
+    Gcc53*) gcc_version=gcc-5.3.0 ;;
-    Gcc51)
+    Gcc54*) gcc_version=gcc-5.4.0 ;;
-        gcc_version=gcc-5.1.0
+    Gcc55*) gcc_version=gcc-5.5.0 ;;
-        ;;
+    Gcc61*) gcc_version=gcc-6.1.0 ;;
-    Gcc52)
+    Gcc62*) gcc_version=gcc-6.2.0 ;;
-        gcc_version=gcc-5.2.0
+    Gcc63*) gcc_version=gcc-6.3.0 ;;
-        ;;
+    Gcc64*) gcc_version=gcc-6.4.0 ;;
-    Gcc53)
+    Gcc65*) gcc_version=gcc-6.5.0 ;;
-        gcc_version=gcc-5.3.0
+    Gcc71*) gcc_version=gcc-7.1.0 ;;
-        ;;
+    Gcc72*) gcc_version=gcc-7.2.0 ;;
-    Gcc54)
+    Gcc73*) gcc_version=gcc-7.3.0 ;;
-        gcc_version=gcc-5.4.0
+    Gcc74*) gcc_version=gcc-7.4.0 ;;
-        ;;
+    Gcc75*) gcc_version=gcc-7.5.0 ;;
-    Gcc55)
+    Gcc81*) gcc_version=gcc-8.1.0 ;;
-        gcc_version=gcc-5.5.0
+    Gcc82*) gcc_version=gcc-8.2.0 ;;
-        ;;
+    Gcc83*) gcc_version=gcc-8.3.0 ;;
-    Gcc61)
+    Gcc91*) gcc_version=gcc-9.1.0 ;;
-        gcc_version=gcc-6.1.0
+    Gcc92*) gcc_version=gcc-9.2.0 ;;
-        ;;
+
-    Gcc62)
+    Clang)    clang_version="$default_clang_version" ;;
-        gcc_version=gcc-6.2.0
+    Clang37*) clang_version=llvm-3.7.1 ;;
-        ;;
+    Clang38*) clang_version=llvm-3.8.1 ;;
-    Gcc63)
+    Clang39*) clang_version=llvm-3.9.1 ;;
-        gcc_version=gcc-6.3.0
+    Clang40*) clang_version=llvm-4.0.1 ;;
-        ;;
+    Clang50*) clang_version=llvm-5.0.2 ;;
-    Gcc64)
+    Clang60*) clang_version=llvm-6.0.1 ;;
-        gcc_version=gcc-6.4.0
+    Clang70*) clang_version=llvm-7.0.1 ;;
-        ;;
+    Clang71*) clang_version=llvm-7.1.0 ;;
-    Gcc71)
+    Clang80*) clang_version=llvm-8.0.1 ;;
-        gcc_version=gcc-7.1.0
+    Clang90*) clang_version=llvm-9.0.0 ;;
-        ;;
+
-    Gcc72)
-        gcc_version=gcc-7.2.0
-        ;;
-    Clang)
-        clang_version=llvm-3.7.1
-        ;;
-    Clang38)
-        clang_version=llvm-3.8.1
-        ;;
-    Clang39)
-        clang_version=llvm-3.9.1
-        ;;
-    Clang40)
-        clang_version=llvm-4.0.1
-        ;;
-    Clang50)
-        clang_version=llvm-5.0.0
-        ;;
     *)
         /bin/cat << UNKNOWN_COMPILER 1>&2
 ===============================================================================
@@ -94,4 +86,7 @@ UNKNOWN_COMPILER
     ;;
 esac
 
+unset default_gcc_version default_clang_version
+unset default_gmp_version default_mpfr_version default_mpc_version
+
 #------------------------------------------------------------------------------

etc/config.sh/unset

@@ -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) 2016-2017 OpenCFD Ltd.
+#    \\/     M anipulation  | Copyright (C) 2016-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@@ -63,6 +63,7 @@ unset WM_THIRD_PARTY_DIR
 #------------------------------------------------------------------------------
 # Unset FOAM_* environment variables
 
+unset FOAM_API
 unset FOAM_APPBIN
 unset FOAM_APP
 unset FOAM_CODE_TEMPLATES

etc/cshrc

@@ -33,7 +33,7 @@
 #------------------------------------------------------------------------------
 
 setenv WM_PROJECT OpenFOAM
-setenv WM_PROJECT_VERSION plus
+setenv WM_PROJECT_VERSION v1712
 
 # [FOAM_INST_DIR] - parent directory containing the OpenFOAM installation.
 # \- When this file is located as $WM_PROJECT_DIR/etc/cshrc, the next lines

src/Allwmake

@@ -79,6 +79,7 @@ functionObjects/Allwmake $targetType $*
 
 wmake $targetType lumpedPointMotion
 wmake $targetType sixDoFRigidBodyMotion
+wmake $targetType sixDoFRigidBodyState
 wmake $targetType rigidBodyDynamics
 wmake $targetType rigidBodyMeshMotion
 

src/OSspecific/POSIX/POSIX.C

@@ -57,10 +57,10 @@ Description
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #include <dlfcn.h>
 #include <link.h>
 
-#include <netinet/in.h>
 #ifdef USE_RANDOM
     #include <climits>
     #if INT_MAX    != 2147483647
@@ -708,12 +708,12 @@ double Foam::highResLastModified(const fileName& name, const bool followLink)
     // Ignore an empty name
     if (!name.empty())
     {
-        fileStat fileStatus(name);
+        fileStat fileStatus(name, followLink);
         if (fileStatus.isValid())
         {
             return
                 fileStatus.status().st_mtime
-              + 1e-9*fileStatus.status().st_atim.tv_nsec;
+              + 1e-9*fileStatus.status().st_mtim.tv_nsec;
         }
     }
 
@@ -1301,7 +1301,7 @@ bool Foam::ping
     }
 
     // Fill sockaddr_in structure with dest address and port
-    memset(reinterpret_cast<char *>(&destAddr), '\0', sizeof(destAddr));
+    std::memset(reinterpret_cast<char *>(&destAddr), '\0', sizeof(destAddr));
     destAddr.sin_family = AF_INET;
     destAddr.sin_port = htons(ushort(destPort));
     destAddr.sin_addr.s_addr = addr;

src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C

@@ -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) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -2560,6 +2560,11 @@ Foam::labelBits Foam::indexedOctree<Type>::findNode
 template<class Type>
 Foam::label Foam::indexedOctree<Type>::findInside(const point& sample) const
 {
+    if (nodes_.empty())
+    {
+        return -1;
+    }
+
     labelBits index = findNode(0, sample);
 
     const node& nod = nodes_[getNode(index)];
@@ -2592,6 +2597,11 @@ const Foam::labelList& Foam::indexedOctree<Type>::findIndices
     const point& sample
 ) const
 {
+    if (nodes_.empty())
+    {
+        return emptyList<label>();
+    }
+
     labelBits index = findNode(0, sample);
 
     const node& nod = nodes_[getNode(index)];
@@ -2603,10 +2613,8 @@ const Foam::labelList& Foam::indexedOctree<Type>::findIndices
     {
         return contents_[getContent(contentIndex)];
     }
-    else
+
-    {
+    return emptyList<label>();
-        return emptyList<label>();
-    }
 }
 
 
@@ -2688,18 +2696,21 @@ void Foam::indexedOctree<Type>::findNear
     CompareOp& cop
 ) const
 {
-    findNear
+    if (!nodes_.empty())
-    (
+    {
-        nearDist,
+        findNear
-        true,
+        (
-        *this,
+            nearDist,
-        nodePlusOctant(0, 0),
+            true,
-        bb(),
+            *this,
-        tree2,
+            nodePlusOctant(0, 0),
-        nodePlusOctant(0, 0),
+            bb(),
-        tree2.bb(),
+            tree2,
-        cop
+            nodePlusOctant(0, 0),
-    );
+            tree2.bb(),
+            cop
+        );
+    }
 }
 
 
@@ -2711,6 +2722,11 @@ void Foam::indexedOctree<Type>::print
     const label nodeI
 ) const
 {
+    if (nodes_.empty())
+    {
+        return;
+    }
+
     const node& nod = nodes_[nodeI];
     const treeBoundBox& bb = nod.bb_;
 

src/OpenFOAM/containers/HashTables/HashTable/HashTable.H

@@ -784,8 +784,8 @@ public:
 
           // Constructors
 
-            //- Construct null (end iterator)
+            //- Default construct (end iterator)
-            inline iterator() {}
+            iterator() = default;
 
             //- Copy construct from similar access type
             inline explicit iterator(const Iterator<false>& iter)
@@ -828,8 +828,11 @@ public:
 
           // Constructors
 
-            //- Construct null (end iterator)
+            //- Default construct (end iterator)
-            inline const_iterator() {}
+            const_iterator() = default;
+
+            //- Copy construct
+            const_iterator(const const_iterator&) = default;
 
             //- Copy construct from similar access type
             inline explicit const_iterator(const Iterator<true>& iter)

src/OpenFOAM/containers/HashTables/HashTableOps/HashTableOps.H

@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 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/>.
+
+InNamspace
+    Foam
+
+Description
+    Various functions to operate on HashTables.
+
+SourceFiles
+    HashTableOps.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef HashTableOps_H
+#define HashTableOps_H
+
+#include "HashSet.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+//- Combine HashSet operation. Equivalent to 'a += b'
+template<class Key=word, class Hash=string::hash>
+struct HashSetPlusEqOp
+{
+    typedef HashSet<Key, Hash> value_type;
+
+    void operator()(value_type& a, const value_type& b) const
+    {
+        a += b;
+    }
+};
+
+
+//- Combine HashTable operation. Equivalent to 'a += b'
+template<class T, class Key=word, class Hash=string::hash>
+struct HashTablePlusEqOp
+{
+    typedef HashTable<T, Key, Hash> value_type;
+
+    void operator()(value_type& a, const value_type& b) const
+    {
+        if (b.size())
+        {
+            if (a.size())
+            {
+                forAllConstIters(b, citer)
+                {
+                    a.insert(citer.key(), citer.object());
+                }
+            }
+            else
+            {
+                a = b;
+            }
+        }
+    }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H

@@ -200,6 +200,9 @@ public:
 
         public:
 
+            //- Copy construct
+            iterator(const iterator&) = default;
+
             //- Construct for a given DLListBase and link
             inline iterator(DLListBase&, link*);
 
@@ -240,6 +243,9 @@ public:
             //- Construct from a non-const iterator
             inline const_iterator(const DLListBase::iterator& iter);
 
+            //- Copy construct
+            const_iterator(const const_iterator&) = default;
+
             //- Currently pointing at a valid entry
             inline bool found() const;
 
@@ -277,6 +283,9 @@ public:
             //- Construct for a given DLListBase and link
             inline const_reverse_iterator(const DLListBase& lst, const link*);
 
+            //- Copy construct
+            const_reverse_iterator(const const_reverse_iterator&) = default;
+
             //- Currently pointing at a valid entry
             inline bool found() const;
 

src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H

@@ -182,6 +182,9 @@ public:
 
         public:
 
+            //- Copy construct
+            iterator(const iterator&) = default;
+
             //- Construct for a given SLListBase and link
             inline iterator(SLListBase&, link*);
 
@@ -222,6 +225,9 @@ public:
             //- Construct from a non-const iterator
             inline const_iterator(const SLListBase::iterator& iter);
 
+            //- Copy construct
+            const_iterator(const const_iterator&) = default;
+
             //- Currently pointing at a valid entry
             inline bool found() const;
 

src/OpenFOAM/containers/Lists/List/List.C

@@ -108,21 +108,26 @@ Foam::List<T>::List(const List<T>& a)
 :
     UList<T>(nullptr, a.size_)
 {
-    if (this->size_)
+    const label len = this->size_;
+
+    if (len)
     {
         alloc();
 
         #ifdef USEMEMCPY
         if (contiguous<T>())
         {
-            memcpy(this->v_, a.v_, this->byteSize());
+            std::memcpy
+            (
+                static_cast<void*>(this->v_), a.v_, this->byteSize()
+            );
         }
         else
         #endif
         {
             List_ACCESS(T, (*this), vp);
             List_CONST_ACCESS(T, a, ap);
-            List_FOR_ALL((*this), i)
+            for (label i = 0; i < len; ++i)
             {
                 vp[i] = ap[i];
             }
@@ -137,7 +142,9 @@ Foam::List<T>::List(const List<T2>& a)
 :
     UList<T>(nullptr, a.size())
 {
-    if (this->size_)
+    const label len = this->size_;
+
+    if (len)
     {
         alloc();
 
@@ -162,22 +169,29 @@ Foam::List<T>::List(List<T>& a, bool reuse)
         this->v_ = a.v_;
         a.v_ = nullptr;
         a.size_ = 0;
+        return;
     }
-    else if (this->size_)
+
+    const label len = this->size_;
+
+    if (len)
     {
         alloc();
 
         #ifdef USEMEMCPY
         if (contiguous<T>())
         {
-            memcpy(this->v_, a.v_, this->byteSize());
+            std::memcpy
+            (
+                static_cast<void*>(this->v_), a.v_, this->byteSize()
+            );
         }
         else
         #endif
         {
             List_ACCESS(T, (*this), vp);
             List_CONST_ACCESS(T, a, ap);
-            List_FOR_ALL((*this), i)
+            for (label i = 0; i < len; ++i)
             {
                 vp[i] = ap[i];
             }
@@ -338,7 +352,7 @@ void Foam::List<T>::setSize(const label newSize)
                 #ifdef USEMEMCPY
                 if (contiguous<T>())
                 {
-                    memcpy(nv, this->v_, overlap*sizeof(T));
+                    std::memcpy(nv, this->v_, overlap*sizeof(T));
                 }
                 else
                 #endif
@@ -420,19 +434,24 @@ void Foam::List<T>::operator=(const UList<T>& a)
 {
     reAlloc(a.size_);
 
-    if (this->size_)
+    const label len = this->size_;
+
+    if (len)
     {
         #ifdef USEMEMCPY
         if (contiguous<T>())
         {
-            memcpy(this->v_, a.v_, this->byteSize());
+            std::memcpy
+            (
+                static_cast<void*>(this->v_), a.v_, this->byteSize()
+            );
         }
         else
         #endif
         {
             List_ACCESS(T, (*this), vp);
             List_CONST_ACCESS(T, a, ap);
-            List_FOR_ALL((*this), i)
+            for (label i = 0; i < len; ++i)
             {
                 vp[i] = ap[i];
             }

src/OpenFOAM/containers/Lists/PackedList/PackedListI.H

@@ -544,8 +544,6 @@ inline void Foam::PackedList<nBits>::const_iterator::operator=
     {
         this->index_ = this->list_->size_;
     }
-
-    return *this;
 }
 
 

src/OpenFOAM/containers/Lists/SubList/SubList.H

@@ -64,6 +64,12 @@ public:
         inline static const SubList<T>& null();
 
 
+    // Generated Methods
+
+        //- Copy construct
+        SubList(const SubList&) = default;
+
+
     // Constructors
 
         //- Construct from UList and sub-list size

src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H

@@ -80,6 +80,12 @@ public:
             const labelUList& addr
         );
 
+        //- Copy construct (shallow copy of values and addressing arrays)
+        UIndirectList(const UIndirectList<T>& list)
+        :
+            UIndirectList<T>(list.completeList_, list.addressing_)
+        {}
+
 
     // Member Functions
 

src/OpenFOAM/containers/Lists/UList/UList.C

@@ -137,7 +137,10 @@ void Foam::UList<T>::deepCopy(const UList<T>& a)
         #ifdef USEMEMCPY
         if (contiguous<T>())
         {
-            memcpy(this->v_, a.v_, this->byteSize());
+            std::memcpy
+            (
+                static_cast<void*>(this->v_), list.v_, this->byteSize()
+            );
         }
         else
         #endif

src/OpenFOAM/containers/Lists/UList/UList.H

@@ -174,6 +174,12 @@ public:
         };
 
 
+    // Generated Methods
+
+        //- Copy construct
+        UList(const UList<T>&) = default;
+
+
     // Constructors
 
         //- Null constructor

src/OpenFOAM/db/IOobject/IOobject.C

@@ -340,12 +340,6 @@ Foam::IOobject::IOobject
 {}
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-Foam::IOobject::~IOobject()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 const Foam::objectRegistry& Foam::IOobject::db() const

src/OpenFOAM/db/IOobject/IOobject.H

@@ -220,6 +220,15 @@ public:
         static inline word groupName(StringType name, const word& group);
 
 
+    // Generated Methods
+
+        //- Copy construct
+        IOobject(const IOobject&) = default;
+
+        //- Destructor
+        virtual ~IOobject() = default;
+
+
     // Constructors
 
         //- Construct from name, instance, registry, io options
@@ -289,10 +298,6 @@ public:
         }
 
 
-    //- Destructor
-    virtual ~IOobject();
-
-
     // Member Functions
 
       // General access

src/OpenFOAM/db/IOobjectList/IOobjectList.C

@@ -171,10 +171,9 @@ Foam::IOobjectList::IOobjectList
             // Use object with local scope and current instance (no searching)
             ok = objectPtr->typeHeaderOk<IOList<label>>(false, false);
         }
-        catch (Foam::IOerror& err)
+        catch (const Foam::IOerror& err)
         {
-            Warning
+            Warning << err << nl << endl;
-                << err << nl << endl;
         }
 
         FatalIOError.throwExceptions(throwingIOerr);

src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C

@@ -169,14 +169,6 @@ Foam::CompactIOField<T, BaseType>::CompactIOField
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class T, class BaseType>
-Foam::CompactIOField<T, BaseType>::~CompactIOField()
-{}
-
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T, class BaseType>

src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H

@@ -85,6 +85,9 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        CompactIOField(const CompactIOField&) = default;
+
         //- Construct from IOobject
         CompactIOField(const IOobject&);
 
@@ -103,7 +106,7 @@ public:
 
     // Destructor
 
-        virtual ~CompactIOField();
+        virtual ~CompactIOField() = default;
 
 
     // Member functions

src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C

@@ -91,13 +91,6 @@ Foam::GlobalIOField<Type>::GlobalIOField
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::GlobalIOField<Type>::~GlobalIOField()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>

src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H

@@ -61,6 +61,9 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        GlobalIOField(const GlobalIOField&) = default;
+
         //- Construct from IOobject
         GlobalIOField(const IOobject&);
 
@@ -75,7 +78,7 @@ public:
 
 
     //- Destructor
-    virtual ~GlobalIOField();
+    virtual ~GlobalIOField() = default;
 
 
     // Member functions

src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C

@@ -87,13 +87,6 @@ Foam::GlobalIOList<Type>::GlobalIOList
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::GlobalIOList<Type>::~GlobalIOList()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>

src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H

@@ -61,6 +61,9 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        GlobalIOList(const GlobalIOList&) = default;
+
         //- Construct from IOobject
         GlobalIOList(const IOobject&);
 
@@ -75,7 +78,7 @@ public:
 
 
     //- Destructor
-    virtual ~GlobalIOList();
+    virtual ~GlobalIOList() = default;
 
 
     // Member functions

src/OpenFOAM/db/IOobjects/IOField/IOField.C

@@ -166,12 +166,6 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type>>& f)
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::IOField<Type>::~IOField()
-{}
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>

src/OpenFOAM/db/IOobjects/IOField/IOField.H

@@ -61,6 +61,9 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        IOField(const IOField&) = default;
+
         //- Construct from IOobject
         IOField(const IOobject&);
 
@@ -78,7 +81,7 @@ public:
 
 
     //- Destructor
-    virtual ~IOField();
+    virtual ~IOField() = default;
 
 
     // Member functions

src/OpenFOAM/db/IOobjects/IOList/IOList.C

@@ -129,13 +129,6 @@ Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T>>& list)
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class T>
-Foam::IOList<T>::~IOList()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>

src/OpenFOAM/db/IOobjects/IOList/IOList.H

@@ -62,6 +62,9 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        IOList(const IOList&) = default;
+
         //- Construct from IOobject
         IOList(const IOobject&);
 
@@ -76,7 +79,7 @@ public:
 
 
     //- Destructor
-    virtual ~IOList();
+    virtual ~IOList() = default;
 
 
     // Member functions

src/OpenFOAM/db/IOobjects/IOMap/IOMap.C

@@ -128,13 +128,6 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const Xfer<Map<T>>& map)
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class T>
-Foam::IOMap<T>::~IOMap()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>

src/OpenFOAM/db/IOobjects/IOMap/IOMap.H

@@ -63,6 +63,9 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        IOMap(const IOMap&) = default;
+
         //- Construct from IOobject
         IOMap(const IOobject&);
 
@@ -77,7 +80,7 @@ public:
 
 
     //- Destructor
-    virtual ~IOMap();
+    virtual ~IOMap() = default;
 
 
     // Member functions

src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C

@@ -141,13 +141,6 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const Xfer<PtrList<T>>& list)
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class T>
-Foam::IOPtrList<T>::~IOPtrList()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>

src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H

@@ -62,6 +62,9 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        IOPtrList(const IOPtrList&) = default;
+
         //- Construct from IOobject using given Istream constructor class
         template<class INew>
         IOPtrList(const IOobject&, const INew&);
@@ -80,7 +83,7 @@ public:
 
 
     //- Destructor
-    virtual ~IOPtrList();
+    virtual ~IOPtrList() = default;
 
 
     // Member functions

src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.C

@@ -75,12 +75,6 @@ Foam::baseIOdictionary::baseIOdictionary
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-Foam::baseIOdictionary::~baseIOdictionary()
-{}
-
-
 // * * * * * * * * * * * * * * * Members Functions * * * * * * * * * * * * * //
 
 const Foam::word& Foam::baseIOdictionary::name() const

src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H

@@ -66,6 +66,18 @@ public:
     TypeName("dictionary");
 
 
+    // Generated Methods
+
+        //- Copy construct
+        baseIOdictionary(const baseIOdictionary&) = default;
+
+        //- Move construct
+        baseIOdictionary(baseIOdictionary&&) = default;
+
+        //- Destructor
+        virtual ~baseIOdictionary() = default;
+
+
     // Constructors
 
         //- Construct given an IOobject
@@ -78,11 +90,7 @@ public:
         baseIOdictionary(const IOobject&, Istream&);
 
 
-    //- Destructor
+    // Member Functions
-    virtual ~baseIOdictionary();
-
-
-    // Member functions
 
         //- Return complete path + object name if the file exists
         //  either in the case/processor or case otherwise null

src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C

@@ -177,7 +177,7 @@ void Foam::IFstream::rewind()
     {
         gzPtr = dynamic_cast<igzstream*>(allocatedPtr_);
     }
-    catch (std::bad_cast)
+    catch (const std::bad_cast&)
     {
         gzPtr = nullptr;
     }

src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H

@@ -263,6 +263,15 @@ protected:
 
 public:
 
+    // Generated Methods
+
+        //- Copy construct
+        IOstream(const IOstream&) = default;
+
+        //- Destructor
+        virtual ~IOstream() = default;
+
+
     // Constructors
 
         //- Construct setting format and version
@@ -284,11 +293,6 @@ public:
         }
 
 
-    //- Destructor
-    virtual ~IOstream()
-    {}
-
-
     // Member functions
 
         // Access

src/OpenFOAM/db/IOstreams/IOstreams/Istream.H

@@ -70,6 +70,15 @@ class Istream
 
 public:
 
+    // Generated Methods
+
+        //- Copy construct
+        Istream(const Istream&) = default;
+
+        //- Destructor
+        virtual ~Istream() = default;
+
+
     // Constructors
 
         //- Construct and set stream status
@@ -85,12 +94,7 @@ public:
         {}
 
 
-    //- Destructor
+    // Member Functions
-    virtual ~Istream()
-    {}
-
-
-    // Member functions
 
         // Read functions
 

src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H

@@ -72,6 +72,15 @@ protected:
 
 public:
 
+    // Generated Methods
+
+        //- Copy construct
+        Ostream(const Ostream&) = default;
+
+        //- Destructor
+        virtual ~Ostream() = default;
+
+
     // Constructors
 
         //- Construct and set stream status
@@ -87,12 +96,7 @@ public:
         {}
 
 
-    //- Destructor
+    // Member Functions
-    virtual ~Ostream()
-    {}
-
-
-    // Member functions
 
         // Write functions
 

src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H

@@ -59,14 +59,17 @@ class OSstream
         std::ostream& os_;
 
 
-    // Private Member Functions
+public:
+
+    // Generated Methods
+
+        //- Copy construct
+        OSstream(const OSstream&) = default;
 
         //- Disallow default bitwise assignment
         void operator=(const OSstream&) = delete;
 
 
-public:
-
     // Constructors
 
         //- Construct as wrapper around std::ostream and set stream status

src/OpenFOAM/db/IOstreams/Tstreams/ITstream.C

@@ -301,4 +301,32 @@ void Foam::ITstream::rewind()
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+void Foam::ITstream::operator=(const ITstream& is)
+{
+    Istream::operator=(is);
+    tokenList::operator=(is);
+    name_ = is.name_;
+
+    rewind();
+}
+
+
+void Foam::ITstream::operator=(const tokenList& toks)
+{
+    tokenList::operator=(toks);
+
+    rewind();
+}
+
+
+void Foam::ITstream::operator=(tokenList&& toks)
+{
+    tokenList::operator=(std::move(toks));
+
+    rewind();
+}
+
+
 // ************************************************************************* //

src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H

@@ -271,10 +271,22 @@ public:
             }
 
 
-        // Print
+    // Output
 
-            //- Print description of stream to Ostream
+        //- Print stream description to Ostream
-            void print(Ostream& os) const;
+        void print(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Copy assignment, with rewind()
+        void operator=(const ITstream& is);
+
+        //- Copy assignment of tokens, with rewind()
+        void operator=(const tokenList& toks);
+
+        //- Move assignment of tokens, with rewind()
+        void operator=(tokenList&& toks);
 };
 
 

src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C

@@ -168,7 +168,7 @@ Foam::label Foam::primitiveEntry::startLineNumber() const
 
     if (tokens.size())
     {
-        tokens.first().lineNumber();
+        return tokens.first().lineNumber();
     }
 
     return -1;

src/OpenFOAM/db/error/IOerror.C

@@ -52,7 +52,7 @@ Foam::IOerror::IOerror(const dictionary& errDict)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::IOerror::~IOerror() throw()
+Foam::IOerror::~IOerror() noexcept
 {}
 
 

src/OpenFOAM/db/error/error.C

@@ -129,7 +129,7 @@ Foam::error::error(const error& err)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::error::~error() throw()
+Foam::error::~error() noexcept
 {
     delete messageStreamPtr_;
 }

src/OpenFOAM/db/error/error.H

@@ -97,7 +97,7 @@ public:
 
 
     //- Destructor
-    virtual ~error() throw();
+    virtual ~error() noexcept;
 
 
     // Static Member Functions
@@ -247,7 +247,7 @@ public:
 
 
     //- Destructor
-    virtual ~IOerror() throw();
+    virtual ~IOerror() noexcept;
 
 
     // Member functions

src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C

@@ -828,12 +828,12 @@ bool Foam::functionObjectList::read()
                         foPtr = functionObject::New(key, time_, dict);
                     }
                 }
-                catch (Foam::IOerror& ioErr)
+                catch (const Foam::IOerror& ioErr)
                 {
                     Info<< ioErr << nl << endl;
                     ::exit(1);
                 }
-                catch (Foam::error& err)
+                catch (const Foam::error& err)
                 {
                     // Bit of trickery to get the original message
                     err.write(Warning, false);

src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H

@@ -147,7 +147,7 @@ if (argList::postProcess(argc, argv))
             // Report to output (avoid overwriting values from simulation)
             profiling::print(Info);
         }
-        catch (IOerror& err)
+        catch (const IOerror& err)
         {
             Warning<< err << endl;
         }

src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C

@@ -736,7 +736,8 @@ bool Foam::functionObjects::timeControl::read(const dictionary& dict)
         executeControl_.read(dict);
         readControls();
 
-        return true;
+        // Forward to underlying function object
+        return foPtr_->read(dict);
     }
 
     return false;

src/OpenFOAM/db/typeInfo/typeInfo.H

@@ -88,7 +88,7 @@ inline To& dynamicCast(From& r)
     {
         return dynamic_cast<To&>(r);
     }
-    catch (std::bad_cast)
+    catch (const std::bad_cast&)
     {
         FatalErrorInFunction
             << "Attempt to cast type " << typeid(r).name()
@@ -109,7 +109,7 @@ inline To& refCast(From& r)
     {
         return dynamic_cast<To&>(r);
     }
-    catch (std::bad_cast)
+    catch (const std::bad_cast&)
     {
         FatalErrorInFunction
             << "Attempt to cast type " << r.type()

src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H

@@ -63,6 +63,12 @@ public:
     TypeName("value");
 
 
+    // Generated Methods
+
+        //- Copy construct
+        valuePointPatchField(const valuePointPatchField&) = default;
+
+
     // Constructors
 
         //- Construct from patch and internal field

src/OpenFOAM/global/argList/argList.C

@@ -585,6 +585,9 @@ void Foam::argList::getRootCase()
     // The name of the executable, unless already present in the environment
     setEnv("FOAM_EXECUTABLE", executable_, false);
 
+    // OPENFOAM API
+    setEnv("FOAM_API", std::to_string(OPENFOAM_PLUS), true);
+
     // Set the case and case-name as an environment variable
     if (rootPath_.isAbsolute())
     {

src/OpenFOAM/global/argList/argList.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  | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,6 +57,8 @@ Description
     may be present for some solvers or utilities.
 
     Environment variables set by argList or by Time:
+      - \par FOAM_API
+        The value of the OPENFOAM compiler define
       - \par FOAM_CASE
         The path of the global case.
         It is the same for serial and parallel jobs.

src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C

@@ -2,8 +2,11 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +56,7 @@ void Foam::interpolation2DTable<Type>::readTable()
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable()
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
+    List<value_type>(),
     bounding_(bounds::normalBounding::WARN),
     fileName_("fileNameIsUndefined"),
     reader_(nullptr)
@@ -68,7 +71,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable
     const fileName& fName
 )
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(values),
+    List<value_type>(values),
     bounding_(bounding),
     fileName_(fName),
     reader_(nullptr)
@@ -78,7 +81,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable(const fileName& fName)
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
+    List<value_type>(),
     bounding_(bounds::normalBounding::WARN),
     fileName_(fName),
     reader_(new openFoamTableReader<Type>(dictionary()))
@@ -90,7 +93,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable(const fileName& fName)
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable(const dictionary& dict)
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
+    List<value_type>(),
     bounding_
     (
         bounds::normalBoundingNames.lookupOrFailsafe
@@ -110,17 +113,16 @@ Foam::interpolation2DTable<Type>::interpolation2DTable(const dictionary& dict)
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable
 (
-     const interpolation2DTable& interpTable
+     const interpolation2DTable& tbl
 )
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(interpTable),
+    List<value_type>(tbl),
-    bounding_(interpTable.bounding_),
+    bounding_(tbl.bounding_),
-    fileName_(interpTable.fileName_),
+    fileName_(tbl.fileName_),
-    reader_(interpTable.reader_)    // note: steals reader. Used in write().
+    reader_(tbl.reader_, false) // clone
 {}
 
 
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -308,6 +310,29 @@ Foam::label Foam::interpolation2DTable<Type>::Xi
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
+template<class Type>
+void Foam::interpolation2DTable<Type>::operator=
+(
+    const interpolation2DTable<Type>& rhs
+)
+{
+    if (this == &rhs)
+    {
+        return;
+    }
+
+    static_cast<List<value_type>&>(*this) = rhs;
+    bounding_ = rhs.bounding_;
+    fileName_ = rhs.fileName_;
+    // reader_.reset(rhs.reader_.clone());
+    reader_.reset();
+    if (rhs.reader_.valid())
+    {
+        reader_.reset(rhs.reader_().clone().ptr()); // clone
+    }
+}
+
+
 template<class Type>
 Type Foam::interpolation2DTable<Type>::operator()
 (

src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H

@@ -2,8 +2,11 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,17 +58,7 @@ class interpolation2DTable
 :
     public List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>
 {
-public:
+    // Private Data
-
-    // Public data types
-
-        //- Convenience typedef
-        typedef List<Tuple2<scalar, List<Tuple2<scalar, Type>>>> table;
-
-
-private:
-
-    // Private data
 
         //- Handling for out-of-bound values
         bounds::normalBounding bounding_;
@@ -101,6 +94,15 @@ private:
 
 public:
 
+    // Public Data Types
+
+        //- The element data type
+        typedef Tuple2<scalar, List<Tuple2<scalar, Type>>> value_type;
+
+        //- Convenience typedef
+        typedef List<Tuple2<scalar, List<Tuple2<scalar, Type>>>> table;
+
+
     // Constructors
 
         //- Construct null
@@ -120,8 +122,8 @@ public:
         //- Construct by reading file name and outOfBounds from dictionary
         interpolation2DTable(const dictionary& dict);
 
-        //- Construct copy
+        //- Copy construct
-        interpolation2DTable(const interpolation2DTable& interpTable);
+        interpolation2DTable(const interpolation2DTable& tbl);
 
 
     // Member Functions
@@ -139,6 +141,9 @@ public:
         //- Return an element of constant List<Tuple2<scalar, Type>>
         const List<Tuple2<scalar, Type>>& operator[](const label) const;
 
+        //- Copy assignment
+        void operator=(const interpolation2DTable<Type>& rhs);
+
         //- Return an interpolated value
         Type operator()(const scalar valueX, const scalar valueY) const;
 };

src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C

@@ -2,8 +2,11 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+    \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,7 +60,7 @@ void Foam::interpolationTable<Type>::readTable()
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable()
 :
-    List<Tuple2<scalar, Type>>(),
+    List<value_type>(),
     bounding_(bounds::repeatableBounding::WARN),
     fileName_("fileNameIsUndefined"),
     reader_(nullptr)
@@ -72,7 +75,7 @@ Foam::interpolationTable<Type>::interpolationTable
     const fileName& fName
 )
 :
-    List<Tuple2<scalar, Type>>(values),
+    List<value_type>(values),
     bounding_(bounding),
     fileName_(fName),
     reader_(nullptr)
@@ -82,7 +85,7 @@ Foam::interpolationTable<Type>::interpolationTable
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable(const fileName& fName)
 :
-    List<Tuple2<scalar, Type>>(),
+    List<value_type>(),
     bounding_(bounds::repeatableBounding::WARN),
     fileName_(fName),
     reader_(new openFoamTableReader<Type>(dictionary()))
@@ -94,7 +97,7 @@ Foam::interpolationTable<Type>::interpolationTable(const fileName& fName)
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable(const dictionary& dict)
 :
-    List<Tuple2<scalar, Type>>(),
+    List<value_type>(),
     bounding_
     (
         bounds::repeatableBoundingNames.lookupOrFailsafe
@@ -114,17 +117,16 @@ Foam::interpolationTable<Type>::interpolationTable(const dictionary& dict)
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable
 (
-     const interpolationTable& interpTable
+     const interpolationTable& tbl
 )
 :
-    List<Tuple2<scalar, Type>>(interpTable),
+    List<value_type>(tbl),
-    bounding_(interpTable.bounding_),
+    bounding_(tbl.bounding_),
-    fileName_(interpTable.fileName_),
+    fileName_(tbl.fileName_),
-    reader_(interpTable.reader_)    // note: steals reader. Used in write().
+    reader_(tbl.reader_, false) // clone
 {}
 
 
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -315,6 +317,29 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
+template<class Type>
+void Foam::interpolationTable<Type>::operator=
+(
+    const interpolationTable<Type>& rhs
+)
+{
+    if (this == &rhs)
+    {
+        return;
+    }
+
+    static_cast<List<value_type>&>(*this) = rhs;
+    bounding_ = rhs.bounding_;
+    fileName_ = rhs.fileName_;
+    // reader_.reset(rhs.reader_.clone());
+    reader_.reset();
+    if (rhs.reader_.valid())
+    {
+        reader_.reset(rhs.reader_().clone().ptr()); // clone
+    }
+}
+
+
 template<class Type>
 const Foam::Tuple2<Foam::scalar, Type>&
 Foam::interpolationTable<Type>::operator[](const label i) const

src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H

@@ -2,8 +2,10 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011-2016 OpenFOAM Foundation
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -102,6 +104,15 @@ class interpolationTable
 
 public:
 
+    // Public Data Types
+
+        //- The element data type
+        typedef Tuple2<scalar, Type> value_type;
+
+        //- The mapped data type
+        typedef Type mapped_type;
+
+
     // Constructors
 
         //- Construct null
@@ -123,8 +134,8 @@ public:
         //  This is a specialised constructor used by patchFields
         interpolationTable(const dictionary& dict);
 
-        //- Construct copy
+        //- Copy construct
-        interpolationTable(const interpolationTable& interpTable);
+        interpolationTable(const interpolationTable& tbl);
 
 
     // Member Functions
@@ -143,6 +154,9 @@ public:
 
     // Member Operators
 
+        //- Copy assignment
+        void operator=(const interpolationTable<Type>& rhs);
+
         //- Return an element of constant Tuple2<scalar, Type>
         const Tuple2<scalar, Type>& operator[](const label) const;
 

src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C

@@ -48,7 +48,7 @@ void Foam::processorLduInterface::send
         (
             commsType,
             neighbProcNo(),
-            reinterpret_cast<const char*>(f.begin()),
+            reinterpret_cast<const char*>(f.cdata()),
             nBytes,
             tag(),
             comm()
@@ -62,20 +62,23 @@ void Foam::processorLduInterface::send
         (
             commsType,
             neighbProcNo(),
-            receiveBuf_.begin(),
+            receiveBuf_.data(),
             nBytes,
             tag(),
             comm()
         );
 
         resizeBuf(sendBuf_, nBytes);
-        memcpy(sendBuf_.begin(), f.begin(), nBytes);
+        std::memcpy
+        (
+            static_cast<void*>(sendBuf_.data()), f.cdata(), nBytes
+        );
 
         OPstream::write
         (
             commsType,
             neighbProcNo(),
-            sendBuf_.begin(),
+            sendBuf_.cdata(),
             nBytes,
             tag(),
             comm()
@@ -107,7 +110,7 @@ void Foam::processorLduInterface::receive
         (
             commsType,
             neighbProcNo(),
-            reinterpret_cast<char*>(f.begin()),
+            reinterpret_cast<char*>(f.data()),
             f.byteSize(),
             tag(),
             comm()
@@ -115,7 +118,10 @@ void Foam::processorLduInterface::receive
     }
     else if (commsType == Pstream::commsTypes::nonBlocking)
     {
-        memcpy(f.begin(), receiveBuf_.begin(), f.byteSize());
+        std::memcpy
+        (
+            static_cast<void*>(f.data()), receiveBuf_.cdata(), f.byteSize()
+        );
     }
     else
     {
@@ -154,10 +160,10 @@ void Foam::processorLduInterface::compressedSend
         label nFloats = nm1 + nlast;
         label nBytes = nFloats*sizeof(float);
 
-        const scalar *sArray = reinterpret_cast<const scalar*>(f.begin());
+        const scalar *sArray = reinterpret_cast<const scalar*>(f.cdata());
         const scalar *slast = &sArray[nm1];
         resizeBuf(sendBuf_, nBytes);
-        float *fArray = reinterpret_cast<float*>(sendBuf_.begin());
+        float *fArray = reinterpret_cast<float*>(sendBuf_.data());
 
         for (label i=0; i<nm1; i++)
         {
@@ -176,7 +182,7 @@ void Foam::processorLduInterface::compressedSend
             (
                 commsType,
                 neighbProcNo(),
-                sendBuf_.begin(),
+                sendBuf_.cdata(),
                 nBytes,
                 tag(),
                 comm()
@@ -190,7 +196,7 @@ void Foam::processorLduInterface::compressedSend
             (
                 commsType,
                 neighbProcNo(),
-                receiveBuf_.begin(),
+                receiveBuf_.data(),
                 nBytes,
                 tag(),
                 comm()
@@ -200,7 +206,7 @@ void Foam::processorLduInterface::compressedSend
             (
                 commsType,
                 neighbProcNo(),
-                sendBuf_.begin(),
+                sendBuf_.cdata(),
                 nBytes,
                 tag(),
                 comm()
@@ -246,7 +252,7 @@ void Foam::processorLduInterface::compressedReceive
             (
                 commsType,
                 neighbProcNo(),
-                receiveBuf_.begin(),
+                receiveBuf_.data(),
                 nBytes,
                 tag(),
                 comm()
@@ -260,9 +266,9 @@ void Foam::processorLduInterface::compressedReceive
         }
 
         const float *fArray =
-            reinterpret_cast<const float*>(receiveBuf_.begin());
+            reinterpret_cast<const float*>(receiveBuf_.cdata());
         f.last() = reinterpret_cast<const Type&>(fArray[nm1]);
-        scalar *sArray = reinterpret_cast<scalar*>(f.begin());
+        scalar *sArray = reinterpret_cast<scalar*>(f.data());
         const scalar *slast = &sArray[nm1];
 
         for (label i=0; i<nm1; i++)

src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.C

@@ -72,12 +72,6 @@ Foam::patchIdentifier::patchIdentifier
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::patchIdentifier::~patchIdentifier()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::patchIdentifier::inGroup(const word& name) const

src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H

@@ -73,6 +73,18 @@ class patchIdentifier
 
 public:
 
+    // Generated Methods
+
+        //- Copy construct
+        patchIdentifier(const patchIdentifier&) = default;
+
+        //- Copy assignment
+        patchIdentifier& operator=(const patchIdentifier&) = default;
+
+        //- Destructor
+        virtual ~patchIdentifier() = default;
+
+
     // Constructors
 
         //- Construct from components
@@ -100,10 +112,6 @@ public:
         );
 
 
-    //- Destructor
-    virtual ~patchIdentifier();
-
-
     // Member Functions
 
         //- Return the patch name

src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.H

@@ -80,6 +80,15 @@ public:
         static const word emptyType;
 
 
+    // Generated Methods
+
+        //- Copy construct
+        surfZoneIdentifier(const surfZoneIdentifier&) = default;
+
+        //- Copy assignment
+        surfZoneIdentifier& operator=(const surfZoneIdentifier&) = default;
+
+
     // Constructors
 
         //- Construct null