diff --git a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.C b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.C
index d7806ab75320fe19001385dca229ffb0196587bf..a18bdc12e05c6dec4035fe79dd2787a85f22d47a 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.C
@@ -334,4 +334,10 @@ void Foam::functionObjectFile::writeHeader
}
+void Foam::functionObjectFile::writeTime(Ostream& os) const
+{
+ os << setw(charWidth()) << obr_.time().timeName();
+}
+
+
// ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
index 5b5e3597a14a737ff0d0588f64826c7b869f947b..33a4ae5122a324e9a17dfc1f0679c3b5d157f8e4 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
@@ -180,6 +180,9 @@ public:
const string& str
) const;
+ //- Write the current time to stream
+ void writeTime(Ostream& os) const;
+
//- Write a (commented) header property and value pair
template<class Type>
void writeHeaderValue
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
index 480d5fa8be0de617ad564bbb122c6b59dd30ab5a..608f1a627540a41d54fdb1dcf508ad32f0b8fc8a 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
@@ -129,8 +129,9 @@ void Foam::cloudInfo::write()
if (Pstream::master())
{
+ writeTime(file(i));
file(i)
- << obr_.time().value() << token::TAB
+ << token::TAB
<< nParcels << token::TAB
<< massInSystem << endl;
}
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
index 262e639784a662d8bb41bd31a3a7e0b9e7fcfbfa..f50bb2a673b040980cf8f4f3f25ba76e1ca16f11 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
@@ -166,7 +166,7 @@ void Foam::fieldMinMax::write()
{
functionObjectFile::write();
- if (!location_) file()<< obr_.time().value();
+ if (!location_) writeTime(file());
if (log_) Info<< type() << " " << name_ << " output:" << nl;
forAll(fieldSet_, fieldI)
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
index 4dadb68b48489027ba462c174569571b6d122b95..a800dbd5688975c7383e900a0601d9b2d621516b 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
@@ -45,7 +45,7 @@ void Foam::fieldMinMax::output
if (location_)
{
- file<< obr_.time().value();
+ writeTime(file());
writeTabbed(file, fieldName);
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
index c6e78bf5c2c94ccd1e64fc93cc0902e543b97dab..3b1d86eaf6662f50fb1f943be9f483d1dd4346bf 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
@@ -234,7 +234,7 @@ void Foam::fieldValues::cellSource::write()
{
if (Pstream::master())
{
- file() << obr_.time().value();
+ writeTime(file());
}
if (writeVolume_)
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
index d0b854784efdd2fdacd164d01a4d90d8a1c691f3..b54175b32469f7223a690d520e24d2ec5874ef29 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
@@ -675,7 +675,7 @@ void Foam::fieldValues::faceSource::write()
if (Pstream::master())
{
- file() << obr_.time().value();
+ writeTime(file());
}
if (writeArea_)
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
index 28e5866b013246046e0411dff990f875acecb504..e0420a61d22b90479cb79e7422c35ad678b6f58b 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
@@ -155,7 +155,7 @@ void Foam::fieldValues::fieldValueDelta::write()
if (Pstream::master())
{
- file()<< obr_.time().value();
+ writeTime(file());
}
if (log_) Info<< type() << " " << name_ << " output:" << endl;
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 4d548a3a2f1e81bbdf56aaaf538dbf9282905a54..6730410c2cf68ecff384a238596841e83ebb700f 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -223,8 +223,9 @@ void Foam::forceCoeffs::write()
scalar Clf = Cl/2.0 + Cm;
scalar Clr = Cl/2.0 - Cm;
+ writeTime(file(0));
file(0)
- << obr_.time().value() << tab << Cm << tab << Cd
+ << tab << Cm << tab << Cd
<< tab << Cl << tab << Clf << tab << Clr << endl;
if (log_) Info<< type() << " " << name_ << " output:" << nl
@@ -246,7 +247,7 @@ void Foam::forceCoeffs::write()
}
}
- file(1)<< obr_.time().value();
+ writeTime(file(1));
forAll(coeffs[0], i)
{
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index 8417fccd6e384970f9313905cdc6e6b2bb85952a..05f84d09b7b7a682a68a7798408b648b8bcd6efc 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -402,7 +402,8 @@ void Foam::forces::writeForces()
<< " porous : " << sum(moment_[2])
<< endl;
- file(0) << obr_.time().value() << tab << setw(1) << '('
+ writeTime(file(0));
+ file(0) << tab << setw(1) << '('
<< sum(force_[0]) << setw(1) << ' '
<< sum(force_[1]) << setw(1) << ' '
<< sum(force_[2]) << setw(3) << ") ("
@@ -420,7 +421,8 @@ void Foam::forces::writeForces()
vectorField localMomentT(coordSys_.localVector(moment_[1]));
vectorField localMomentP(coordSys_.localVector(moment_[2]));
- file(0) << obr_.time().value() << tab << setw(1) << '('
+ writeTime(file(0));
+ file(0) << tab << setw(1) << '('
<< sum(localForceN) << setw(1) << ' '
<< sum(localForceT) << setw(1) << ' '
<< sum(localForceP) << setw(3) << ") ("
@@ -456,7 +458,7 @@ void Foam::forces::writeBins()
}
}
- file(1) << obr_.time().value();
+ writeTime(file(1));
forAll(f[0], i)
{
diff --git a/src/postProcessing/functionObjects/utilities/residuals/residuals.C b/src/postProcessing/functionObjects/utilities/residuals/residuals.C
index d156ecd3e6af0b52dc42314478e4b384e82012c5..1cea77a8e0d767bf0e9b71388b46540223eda4bf 100644
--- a/src/postProcessing/functionObjects/utilities/residuals/residuals.C
+++ b/src/postProcessing/functionObjects/utilities/residuals/residuals.C
@@ -125,7 +125,7 @@ void Foam::residuals::write()
if (Pstream::master())
{
- file()<< obr_.time().value();
+ writeTime(file());
forAll(fieldSet_, fieldI)
{
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
index 3c57c06fcb444ea35e666443edcf5185d7a02af1..caef71319ff6730afc1e150438c599cf48b1edd0 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
@@ -32,7 +32,7 @@ License
namespace Foam
{
-defineTypeNameAndDebug(timeActivatedFileUpdate, 0);
+ defineTypeNameAndDebug(timeActivatedFileUpdate, 0);
}
diff --git a/src/postProcessing/functionObjects/utilities/yPlus/yPlusTemplates.C b/src/postProcessing/functionObjects/utilities/yPlus/yPlusTemplates.C
index 818610cfe5f3b67a02a86ed6b147d8034f69d3d3..ca10f3d7819c59056401015fa47e436b2019edc3 100644
--- a/src/postProcessing/functionObjects/utilities/yPlus/yPlusTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/yPlus/yPlusTemplates.C
@@ -77,7 +77,8 @@ void Foam::yPlus::calcYPlus
<< " y+ : min = " << minYplus << ", max = " << maxYplus
<< ", average = " << avgYplus << nl;
- file() << obr_.time().value()
+ writeTime(file());
+ file()
<< token::TAB << patch.name()
<< token::TAB << minYplus
<< token::TAB << maxYplus
@@ -107,7 +108,8 @@ void Foam::yPlus::calcYPlus
<< " y+ : min = " << minYplus << ", max = " << maxYplus
<< ", average = " << avgYplus << nl;
- file() << obr_.time().value()
+ writeTime(file());
+ file()
<< token::TAB << patch.name()
<< token::TAB << minYplus
<< token::TAB << maxYplus