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: Separated writeFile and logFiles (previously writeFiles) from regionFunctionObject

Browse Source 
Now the functionality to write single graph files or log files (vs time)
may be used in the creation of any form of functionObject, not just
those relating to a mesh region.
This commit is contained in:
Henry Weller
2016-08-07 15:23:55 +01:00
parent 076c4c6e82
commit 6f098748cc
29 changed files with 197 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
View File

@ -26,7 +26,6 @@ License
#include "writeFile.H"
#include "Time.H"
#include "polyMesh.H"
#include "IOmanip.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -49,7 +48,7 @@ void Foam::functionObjects::writeFile::initStream(Ostream& os) const
Foam::fileName Foam::functionObjects::writeFile::baseFileDir() const
{
fileName baseDir = obr_.time().path();
fileName baseDir = fileObr_.time().path();
if (Pstream::parRun())
{
@ -63,9 +62,9 @@ Foam::fileName Foam::functionObjects::writeFile::baseFileDir() const
}
// Append mesh name if not default region
if (isA<polyMesh>(obr_))
if (isA<polyMesh>(fileObr_))
{
const polyMesh& mesh = refCast<const polyMesh>(obr_);
const polyMesh& mesh = refCast<const polyMesh>(fileObr_);
if (mesh.name() != polyMesh::defaultRegion)
{
baseDir = baseDir/mesh.name();
@ -78,14 +77,10 @@ Foam::fileName Foam::functionObjects::writeFile::baseFileDir() const
Foam::fileName Foam::functionObjects::writeFile::baseTimeDir() const
{
return baseFileDir()/prefix_/obr_.time().timeName();
return baseFileDir()/prefix_/fileObr_.time().timeName();
}
void Foam::functionObjects::writeFile::writeFileHeader(const label i)
{}
Foam::Omanip<int> Foam::functionObjects::writeFile::valueWidth
(
const label offset
@ -99,26 +94,11 @@ Foam::Omanip<int> Foam::functionObjects::writeFile::valueWidth
Foam::functionObjects::writeFile::writeFile
(
const word& name,
const Time& runTime,
const dictionary& dict,
const word& prefix
)
:
regionFunctionObject(name, runTime, dict),
prefix_(prefix)
{}
Foam::functionObjects::writeFile::writeFile
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const word& prefix
)
:
regionFunctionObject(name, obr, dict),
fileObr_(obr),
prefix_(prefix)
{}
@ -171,7 +151,7 @@ void Foam::functionObjects::writeFile::writeHeader
void Foam::functionObjects::writeFile::writeTime(Ostream& os) const
{
os << setw(charWidth()) << obr_.time().timeName();
os << setw(charWidth()) << fileObr_.time().timeName();
}