Merge remote-tracking branch 'origin/develop' into integration-foundation

src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H

@@ -176,7 +176,7 @@ public:
     // Member Functions
 
         //- Read optional controls
-        virtual bool read(const dictionary& dict) override;
+        virtual bool read(const dictionary& dict);
 };
 
 

src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.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  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,8 +68,18 @@ void Foam::gnuplotSetWriter<Type>::write
 ) const
 {
     os  << "set term postscript color" << nl
-        << "set output \"" << points.name() << ".ps\"" << nl
+        << "set output \"" << points.name() << ".ps\"" << nl;
-        << "plot";
+
+    // Set secondary Y axis if using two columns. Falls back to same
+    // values if both on same scale. However, ignore if more columns.
+    if (valueSetNames.size() == 2)
+    {
+        os  << "set ylabel \"" << valueSetNames[0] << "\"" << nl
+            << "set y2label \"" << valueSetNames[1] << "\"" << nl
+            << "set ytics nomirror" << nl << "set y2tics" << nl;
+    }
+
+    os  << "plot";
 
     forAll(valueSets, i)
     {
@@ -79,10 +89,14 @@ void Foam::gnuplotSetWriter<Type>::write
         }
 
         os  << " \"-\" title \"" << valueSetNames[i] << "\" with lines";
+
+        if (valueSetNames.size() == 2)
+        {
+            os  << " axes x1y" << (i+1) ;
+        }
     }
     os  << nl;
 
-
     forAll(valueSets, i)
     {
         this->writeTable(points, *valueSets[i], os);

src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H

@@ -324,7 +324,7 @@ protected:
     // Protected Member Functions
 
         //- The volume mesh or surface registry being used
-        const objectRegistry& obr() const override;
+        const objectRegistry& obr() const;
 
         //- Return the local list of face IDs
         inline const labelList& faceId() const;
@@ -471,10 +471,10 @@ public:
         inline fileName outputDir() const;
 
         //- Read from dictionary
-        virtual bool read(const dictionary& dict) override;
+        virtual bool read(const dictionary& dict);
 
         //- Calculate and write
-        virtual bool write() override;
+        virtual bool write();
 };
 
 

src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H

@@ -255,10 +255,10 @@ public:
     // Public Member Functions
 
         //- Read from dictionary
-        virtual bool read(const dictionary& dict) override;
+        virtual bool read(const dictionary& dict);
 
         //- Calculate and write
-        virtual bool write() override;
+        virtual bool write();
 };
 
 

src/functionObjects/field/histogram/histogram.H

@@ -58,6 +58,12 @@ Usage
         setFormat    | Output format           | yes         |
     \endtable
 
+Note
+    If max is not provided it will use the field's min and max as the bin
+    extremes. If max is provided but not min it will use 0. The set written
+    contains two columns, the first the volume averaged values, the second
+    the raw bin count.
+
 See also
     Foam::functionObject
     Foam::functionObjects::fvMeshFunctionObject

src/sampling/surfMeshSampler/surfMeshSamplers/surfMeshSamplers.H

@@ -192,19 +192,19 @@ public:
         void verbose(const bool verbosity = true);
 
         //- Read the surfMeshSamplers dictionary
-        virtual bool read(const dictionary&) override;
+        virtual bool read(const dictionary&);
 
         //- Execute, does sampling
-        virtual bool execute() override;
+        virtual bool execute();
 
         //- Write sampled values
-        virtual bool write() override;
+        virtual bool write();
 
         //- Update for changes of mesh - expires the surfaces
-        virtual void updateMesh(const mapPolyMesh&) override;
+        virtual void updateMesh(const mapPolyMesh&);
 
         //- Update for mesh point-motion - expires the surfaces
-        virtual void movePoints(const polyMesh&) override;
+        virtual void movePoints(const polyMesh&);
 
         //- Update for changes of mesh due to readUpdate - expires the surfaces
         virtual void readUpdate(const polyMesh::readUpdateState state);

tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus-develop                          |
+|  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus-develop                          |
+|  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus-develop                          |
+|  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/