zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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 cacbc688d8
commit c983670c91
113 changed files with 399 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/sampling/probes/probes.C
View File

@ -352,9 +352,11 @@ void Foam::probes::read(const dictionary& dict)
void Foam::probes::updateMesh(const mapPolyMesh& mpm)
{
if (debug)
DebugInfo<< "probes: updateMesh" << endl;
if (&mpm.mesh() != &mesh_)
{
Info<< "probes: updateMesh" << endl;
return;
}
if (fixedLocations_)
@ -427,14 +429,11 @@ void Foam::probes::updateMesh(const mapPolyMesh& mpm)
}
void Foam::probes::movePoints(const polyMesh&)
void Foam::probes::movePoints(const polyMesh& mesh)
{
if (debug)
{
Info<< "probes: movePoints" << endl;
}
DebugInfo<< "probes: movePoints" << endl;
if (fixedLocations_)
if (fixedLocations_ && &mesh == &mesh_)
{
findElements(mesh_);
}

15
src/sampling/sampledSet/sampledSets/sampledSets.C
View File

@ -30,6 +30,7 @@ License
#include "ListListOps.H"
#include "SortableList.H"
#include "volPointInterpolation.H"
#include "mapPolyMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -296,15 +297,21 @@ void Foam::sampledSets::correct()
}
void Foam::sampledSets::updateMesh(const mapPolyMesh&)
void Foam::sampledSets::updateMesh(const mapPolyMesh& mpm)
{
correct();
if (&mpm.mesh() == &mesh_)
{
correct();
}
}
void Foam::sampledSets::movePoints(const polyMesh&)
void Foam::sampledSets::movePoints(const polyMesh& mesh)
{
correct();
if (&mesh == &mesh_)
{
correct();
}
}

2
src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
View File

@ -15,7 +15,7 @@ functions
functionObjectLibs ("libsampling.so");
outputControl outputTime;
writeControl outputTime;
setFormat gnuplot;
fields (p U);
interpolationScheme cellPoint;

15
src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
View File

@ -30,6 +30,7 @@ License
#include "IOmanip.H"
#include "volPointInterpolation.H"
#include "PatchTools.H"
#include "mapPolyMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -245,17 +246,23 @@ void Foam::sampledSurfaces::read(const dictionary& dict)
}
void Foam::sampledSurfaces::updateMesh(const mapPolyMesh&)
void Foam::sampledSurfaces::updateMesh(const mapPolyMesh& mpm)
{
expire();
if (&mpm.mesh() == &mesh_)
{
expire();
}
// pointMesh and interpolation will have been reset in mesh.update
}
void Foam::sampledSurfaces::movePoints(const polyMesh&)
void Foam::sampledSurfaces::movePoints(const polyMesh& mesh)
{
expire();
if (&mesh == &mesh_)
{
expire();
}
}