diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H index df56087e8a..03ab443678 100644 --- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H +++ b/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); }; diff --git a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C index 4809bb3504..f6c724275e 100644 --- a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C +++ b/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::write ) const { os << "set term postscript color" << nl - << "set output \"" << points.name() << ".ps\"" << nl - << "plot"; + << "set output \"" << points.name() << ".ps\"" << nl; + + // 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::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); diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H index 07d320340d..ee460e983a 100644 --- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H +++ b/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(); }; diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H index 63cbaebc43..db9b34bc1e 100644 --- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H +++ b/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(); }; diff --git a/src/functionObjects/field/histogram/histogram.H b/src/functionObjects/field/histogram/histogram.H index d6147cff1b..f5b9402a44 100644 --- a/src/functionObjects/field/histogram/histogram.H +++ b/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 diff --git a/src/sampling/surfMeshSampler/surfMeshSamplers/surfMeshSamplers.H b/src/sampling/surfMeshSampler/surfMeshSamplers/surfMeshSamplers.H index 5befc3388f..3a93104d4c 100644 --- a/src/sampling/surfMeshSampler/surfMeshSamplers/surfMeshSamplers.H +++ b/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); diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/T b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/T similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/T rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/T diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/U b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/U similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/U rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/U diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/alpha.water.orig b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/alpha.water.orig rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/alpha.water.orig diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/p b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/p rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/p_rgh b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p_rgh similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/0/p_rgh rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p_rgh diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allclean b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allclean similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allclean rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allclean diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allrun b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/Allrun rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/dynamicMeshDict rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/g b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/g rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.air rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/transportProperties rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/turbulenceProperties rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/blockMeshDict.m4 b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/blockMeshDict.m4 similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/blockMeshDict.m4 rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/blockMeshDict.m4 diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/controlDict rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/decomposeParDict rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/fvSchemes rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/fvSolution b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/fvSolution rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict similarity index 100% rename from tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/system/setFieldsDict rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U index 5f79ace4a9..96f7ddbb9a 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U +++ b/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 | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water index 8b0f7e79c1..ef66853b12 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water +++ b/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 | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh index 28fe003658..6e847a6959 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh +++ b/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 | | \*---------------------------------------------------------------------------*/