From 6d71d03f44e3eb9d00b4605295d20a4b9f321e74 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 30 Jun 2016 15:32:21 +0200 Subject: [PATCH] ENH: default to collateTimes on for ensight output - the uncollated version becomes quite difficult to process. Caveat: cannot use "collateTimes true" for non-static geometries --- .../utilities/postProcessing/noise/noise.C | 2 +- .../utilities/postProcessing/noise/noiseDict | 2 +- .../postProcessing/sampling/sample/sampleDict | 2 +- .../noiseModels/surfaceNoise/surfaceNoise.H | 10 +++--- .../writers/ensight/ensightSurfaceWriter.C | 7 ++-- .../writers/ensight/ensightSurfaceWriter.H | 5 +-- .../icoFoam/cavity/cavity/system/controlDict | 34 +++++++++++++++++++ 7 files changed, 49 insertions(+), 13 deletions(-) diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C index cf5794075f..4f9b1948a6 100644 --- a/applications/utilities/postProcessing/noise/noise.C +++ b/applications/utilities/postProcessing/noise/noise.C @@ -70,7 +70,7 @@ Description { ensight { - collateTimes 1; + collateTimes true; } } diff --git a/applications/utilities/postProcessing/noise/noiseDict b/applications/utilities/postProcessing/noise/noiseDict index e983cabc12..95eedffff1 100644 --- a/applications/utilities/postProcessing/noise/noiseDict +++ b/applications/utilities/postProcessing/noise/noiseDict @@ -62,7 +62,7 @@ surfaceNoiseCoeffs { ensight { - collateTimes 1; + collateTimes true; } } diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict index 8e77428d6a..541911cfc0 100644 --- a/applications/utilities/postProcessing/sampling/sample/sampleDict +++ b/applications/utilities/postProcessing/sampling/sample/sampleDict @@ -71,7 +71,7 @@ formatOptions { // ascii/binary format format ascii; - //collateTimes true; // write single file containing multiple timesteps + collateTimes true; // write single file containing multiple timesteps // (only for static surfaces) } vtk diff --git a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H index 3f80ee8b4a..1ba1772df4 100644 --- a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H +++ b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H @@ -37,10 +37,10 @@ Description // Must be a power of 2, default = 2^16 (=65536) N 4096; - // Lower frequency bounds + // Lower frequency bounds fl 25; - // Upper frequency bounds + // Upper frequency bounds fu 25; // Start time @@ -69,7 +69,7 @@ Description { ensight { - collateTimes 1; + collateTimes true; } } \endverbatim @@ -134,10 +134,10 @@ protected: label nFace_; //- Frequency data output interval, default = 1 - // nSamples/2 data points are returned from the FFT, which can + // nSamples/2 data points are returned from the FFT, which can // result in a very large number of output files (1 per frequency) label fftWriteInterval_; - + //- Pointer to the surface reader mutable autoPtr readerPtr_; diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C index c46c2ed83a..e4e37b75c3 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -42,14 +42,15 @@ Foam::ensightSurfaceWriter::ensightSurfaceWriter() : surfaceWriter(), writeFormat_(IOstream::ASCII), - collateTimes_(false) + collateTimes_(true) {} Foam::ensightSurfaceWriter::ensightSurfaceWriter(const dictionary& options) : surfaceWriter(), - writeFormat_(IOstream::ASCII) + writeFormat_(IOstream::ASCII), + collateTimes_(true) { // choose ascii or binary format if (options.found("format")) diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H index d04e69146d..9d5ff392b4 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -52,9 +52,10 @@ class ensightSurfaceWriter { // Private data - //- Write option (default is IOstream::ASCII + //- Write option (default: IOstream::ASCII) IOstream::streamFormat writeFormat_; + //- Collate times (default: ASCII) bool collateTimes_; diff --git a/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict b/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict index 78ef7651b9..4ce3008226 100644 --- a/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict +++ b/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict @@ -45,5 +45,39 @@ timePrecision 6; runTimeModifiable true; +functions +{ + cuttingPlane + { + type surfaces; + functionObjectLibs ("libsampling.so"); + outputControl timeStep; //outputTime; + outputInterval 4; + + surfaceFormat ensight; + formatOptions + { +// ensight { format binary; collateTimes true;} + } + fields (p U); + + interpolationScheme cellPoint; + + surfaces + ( + zNormal_0.0 + { + type cuttingPlane; + planeType pointAndNormal; + pointAndNormalDict + { + basePoint (0 0 0.005); + normalVector (0 0 1); + } + interpolate true; + } + ); + } +} // ************************************************************************* //