Skip to content
Snippets Groups Projects
Commit 7cc8bd7c authored by Andrew Heather's avatar Andrew Heather
Browse files

Merge branch 'master' into develop

parents f8cd592d 766683b9
No related branches found
No related tags found
1 merge request!121Merge develop into master for v1706 release
...@@ -92,7 +92,7 @@ Foam::autoPtr<Foam::OFstream> Foam::functionObjects::writeFile::createFile ...@@ -92,7 +92,7 @@ Foam::autoPtr<Foam::OFstream> Foam::functionObjects::writeFile::createFile
if (Pstream::master() && writeToFile_) if (Pstream::master() && writeToFile_)
{ {
const scalar timeNow = fileObr_.time().timeOutputValue() const scalar timeNow = fileObr_.time().timeOutputValue();
const word startTimeName = Time::timeName(timeNow); const word startTimeName = Time::timeName(timeNow);
fileName outputDir(baseFileDir()/prefix_/startTimeName); fileName outputDir(baseFileDir()/prefix_/startTimeName);
...@@ -258,7 +258,7 @@ void Foam::functionObjects::writeFile::writeHeader ...@@ -258,7 +258,7 @@ void Foam::functionObjects::writeFile::writeHeader
void Foam::functionObjects::writeFile::writeTime(Ostream& os) const void Foam::functionObjects::writeFile::writeTime(Ostream& os) const
{ {
const scalar timeNow = fileObr_.time().timeOutputValue() const scalar timeNow = fileObr_.time().timeOutputValue();
os << setw(charWidth()) << Time::timeName(timeNow); os << setw(charWidth()) << Time::timeName(timeNow);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment