functionObjects: Changed options 'outputControl' -> 'writeControl' and 'outputInterval' -> 'writeInterval'

for consistency with the time controls in controlDict and to avoid
unnecessary confusion.  All code and tutorials have been updated.

The old names 'outputControl' and 'outputInterval' are but supported for
backward compatibility but deprecated.
This commit is contained in:
Henry Weller
2016-05-12 11:38:11 +01:00
parent e1205379eb
commit 71290b4d9e
113 changed files with 399 additions and 295 deletions

View File

@ -58,7 +58,7 @@ functions
enabled true;
// When to output the average fields
outputControl outputTime;
writeControl outputTime;
// Fields to be averaged - runTime modifiable
fields

View File

@ -28,7 +28,7 @@ functions
enabled true;
// When to output the average fields
outputControl outputTime;
writeControl outputTime;
// Fields to be transformed - runTime modifiable
fields

View File

@ -52,7 +52,7 @@ functions
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
outputControl outputTime;
writeControl outputTime;
// Output to log&file (true) or to file only
log true;
@ -93,7 +93,7 @@ functions
type faceSource;
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
outputControl outputTime;
writeControl outputTime;
log true;
valueOutput true;
source faceZone;
@ -111,7 +111,7 @@ functions
type cellSource;
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
outputControl outputTime;
writeControl outputTime;
log true;
valueOutput true;
source cellZone;

View File

@ -54,8 +54,8 @@ functions
type nearWallFields;
// Output every
outputControl outputTime; //timeStep;
//outputInterval 5;
writeControl outputTime; //timeStep;
//writeInterval 5;
// Fields to be sampled. Per field original name and mapped field to
// create.

View File

@ -28,7 +28,7 @@ functions
enabled true;
// When to output the average fields
outputControl outputTime;
writeControl outputTime;
}
}

View File

@ -21,8 +21,8 @@ functions
type readFields;
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
outputControl timeStep;
outputInterval 1;
writeControl timeStep;
writeInterval 1;
fields
(
@ -35,8 +35,8 @@ functions
type faceSource;
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
outputControl timeStep;
outputInterval 1;
writeControl timeStep;
writeInterval 1;
log true;
valueOutput true;
source faceZone;

View File

@ -54,8 +54,8 @@ functions
functionObjectLibs ("libfieldFunctionObjects.so");
// Output every
outputControl outputTime;
// outputInterval 10;
writeControl outputTime;
// writeInterval 10;
setFormat vtk; //gnuplot, raw etc. See sampleDict.

View File

@ -35,6 +35,7 @@ License
#include "mapDistribute.H"
#include "interpolationCellPoint.H"
#include "PatchTools.H"
#include "mapPolyMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -697,16 +698,26 @@ void Foam::functionObjects::streamLine::write()
}
void Foam::functionObjects::streamLine::updateMesh(const mapPolyMesh&)
void Foam::functionObjects::streamLine::updateMesh(const mapPolyMesh& mpm)
{
read(dict_);
const fvMesh& mesh_ = dynamic_cast<const fvMesh&>(obr_);
if (&mpm.mesh() == &mesh_)
{
read(dict_);
}
}
void Foam::functionObjects::streamLine::movePoints(const polyMesh&)
void Foam::functionObjects::streamLine::movePoints(const polyMesh& mesh)
{
// Moving mesh affects the search tree
read(dict_);
const fvMesh& mesh_ = dynamic_cast<const fvMesh&>(obr_);
if (&mesh == &mesh_)
{
// Moving mesh affects the search tree
read(dict_);
}
}

View File

@ -63,8 +63,8 @@ functions
type nearWallFields;
// Output every
outputControl outputTime;
//outputInterval 1;
writeControl outputTime;
//writeInterval 1;
// Fields to be sampled. Per field original name and mapped field to
// create.
@ -86,8 +86,8 @@ functions
type wallBoundedStreamLine;
// Output every
outputControl timeStep; //outputTime;
// outputInterval 10;
writeControl timeStep; //outputTime;
// writeInterval 10;
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot;

View File

@ -37,6 +37,7 @@ License
#include "PatchTools.H"
#include "meshSearchMeshObject.H"
#include "faceSet.H"
#include "mapPolyMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -854,17 +855,30 @@ void Foam::functionObjects::wallBoundedStreamLine::write()
void Foam::functionObjects::wallBoundedStreamLine::updateMesh
(
const mapPolyMesh&
const mapPolyMesh& mpm
)
{
read(dict_);
const fvMesh& mesh_ = dynamic_cast<const fvMesh&>(obr_);
if (&mpm.mesh() == &mesh_)
{
read(dict_);
}
}
void Foam::functionObjects::wallBoundedStreamLine::movePoints(const polyMesh&)
void Foam::functionObjects::wallBoundedStreamLine::movePoints
(
const polyMesh& mesh
)
{
// Moving mesh affects the search tree
read(dict_);
const fvMesh& mesh_ = dynamic_cast<const fvMesh&>(obr_);
if (&mesh == &mesh_)
{
// Moving mesh affects the search tree
read(dict_);
}
}