Skip to content
Snippets Groups Projects
Commit ff9d7507 authored by Andrew Heather's avatar Andrew Heather
Browse files

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

parents ff5e8a7b 258239d0
No related branches found
No related tags found
2 merge requests!121Merge develop into master for v1706 release,!99Integration foundation
Showing
with 35 additions and 15 deletions
...@@ -176,7 +176,7 @@ public: ...@@ -176,7 +176,7 @@ public:
// Member Functions // Member Functions
//- Read optional controls //- Read optional controls
virtual bool read(const dictionary& dict) override; virtual bool read(const dictionary& dict);
}; };
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
...@@ -68,8 +68,18 @@ void Foam::gnuplotSetWriter<Type>::write ...@@ -68,8 +68,18 @@ void Foam::gnuplotSetWriter<Type>::write
) const ) const
{ {
os << "set term postscript color" << nl 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) forAll(valueSets, i)
{ {
...@@ -79,10 +89,14 @@ void Foam::gnuplotSetWriter<Type>::write ...@@ -79,10 +89,14 @@ void Foam::gnuplotSetWriter<Type>::write
} }
os << " \"-\" title \"" << valueSetNames[i] << "\" with lines"; os << " \"-\" title \"" << valueSetNames[i] << "\" with lines";
if (valueSetNames.size() == 2)
{
os << " axes x1y" << (i+1) ;
}
} }
os << nl; os << nl;
forAll(valueSets, i) forAll(valueSets, i)
{ {
this->writeTable(points, *valueSets[i], os); this->writeTable(points, *valueSets[i], os);
......
...@@ -324,7 +324,7 @@ protected: ...@@ -324,7 +324,7 @@ protected:
// Protected Member Functions // Protected Member Functions
//- The volume mesh or surface registry being used //- The volume mesh or surface registry being used
const objectRegistry& obr() const override; const objectRegistry& obr() const;
//- Return the local list of face IDs //- Return the local list of face IDs
inline const labelList& faceId() const; inline const labelList& faceId() const;
...@@ -471,10 +471,10 @@ public: ...@@ -471,10 +471,10 @@ public:
inline fileName outputDir() const; inline fileName outputDir() const;
//- Read from dictionary //- Read from dictionary
virtual bool read(const dictionary& dict) override; virtual bool read(const dictionary& dict);
//- Calculate and write //- Calculate and write
virtual bool write() override; virtual bool write();
}; };
......
...@@ -255,10 +255,10 @@ public: ...@@ -255,10 +255,10 @@ public:
// Public Member Functions // Public Member Functions
//- Read from dictionary //- Read from dictionary
virtual bool read(const dictionary& dict) override; virtual bool read(const dictionary& dict);
//- Calculate and write //- Calculate and write
virtual bool write() override; virtual bool write();
}; };
......
...@@ -58,6 +58,12 @@ Usage ...@@ -58,6 +58,12 @@ Usage
setFormat | Output format | yes | setFormat | Output format | yes |
\endtable \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 See also
Foam::functionObject Foam::functionObject
Foam::functionObjects::fvMeshFunctionObject Foam::functionObjects::fvMeshFunctionObject
......
...@@ -192,19 +192,19 @@ public: ...@@ -192,19 +192,19 @@ public:
void verbose(const bool verbosity = true); void verbose(const bool verbosity = true);
//- Read the surfMeshSamplers dictionary //- Read the surfMeshSamplers dictionary
virtual bool read(const dictionary&) override; virtual bool read(const dictionary&);
//- Execute, does sampling //- Execute, does sampling
virtual bool execute() override; virtual bool execute();
//- Write sampled values //- Write sampled values
virtual bool write() override; virtual bool write();
//- Update for changes of mesh - expires the surfaces //- 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 //- 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 //- Update for changes of mesh due to readUpdate - expires the surfaces
virtual void readUpdate(const polyMesh::readUpdateState state); virtual void readUpdate(const polyMesh::readUpdateState state);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment