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

COMP: Multiple changes - first clean build after latest merge - UNTESTED

Browse Source
This commit is contained in:
Andrew Heather
2016-09-23 15:36:53 +01:00
parent 9fbd612672
commit b9940cbbb1
311 changed files with 4119 additions and 6540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ Foam::autoPtr<Foam::OFstream> Foam::functionObjects::writeFile::createFile
if (Pstream::master() && writeToFile_)
{
const word startTimeName =
obr_.time().timeName(obr_.time().startTime().value());
fileObr_.time().timeName(fileObr_.time().startTime().value());
fileName outputDir(baseFileDir()/prefix_/startTimeName);
@ -105,7 +105,7 @@ Foam::autoPtr<Foam::OFstream> Foam::functionObjects::writeFile::createFile
IFstream is(outputDir/(fName + ".dat"));
if (is.good())
{
fName = fName + "_" + obr_.time().timeName();
fName = fName + "_" + fileObr_.time().timeName();
}
osPtr.set(new OFstream(outputDir/(fName + ".dat")));

13
src/OpenFOAM/db/functionObjects/writeFile/writeFile.H
View File

@ -40,6 +40,7 @@ SourceFiles
#define functionObjects_writeFile_H
#include "objectRegistry.H"
#include "OFstream.H"
#include "IOmanip.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -129,7 +130,8 @@ public:
const word& prefix
);
//- Construct from components and read options from dictionary
//- Construct from objectRegistry and prefix, and read options
// from dictionary
writeFile
(
const objectRegistry& obr,
@ -151,6 +153,12 @@ public:
//- Return access to the file (if only 1)
OFstream& file();
//- Flag to allow writing to file
bool writeToFile() const;
//- Return width of character stream output
label charWidth() const;
//- Write a commented string to stream
void writeCommented(Ostream& os, const string& str) const;
@ -171,9 +179,6 @@ public:
const string& property,
const Type& value
) const;
//- Return width of character stream output
label charWidth() const;
};