functionObjects: Format time according to the specification in controlDict

Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1921

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();
+}
+
+
 // ************************************************************************* //

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

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;
             }

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)

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);
 

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_)

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_)

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;

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)
             {

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)
     {

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)
             {

src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C

@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(timeActivatedFileUpdate, 0);
+    defineTypeNameAndDebug(timeActivatedFileUpdate, 0);
 }
 
 

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