STYLE: writeFile - renamed writeTime to writeCurrentTime to avoid conflicts

2019-09-09 09:19:38 +01:00 · 2019-09-09 09:19:38 +01:00 · 31aad2159f
commit 31aad2159f
parent 1b17784a1f
23 changed files with 25 additions and 25 deletions
--- a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C
@ -415,7 +415,7 @@ bool Foam::functionObjects::sizeDistribution::execute()
 bool Foam::functionObjects::sizeDistribution::write()
 {
    writeFileHeader();
-    writeTime(file());
+    writeCurrentTime(file());

    Log << type() << " " << name() << " write" << nl;

--- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
+++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
@ -275,7 +275,7 @@ void Foam::functionObjects::writeFile::writeHeader
 }


-void Foam::functionObjects::writeFile::writeTime(Ostream& os) const
+void Foam::functionObjects::writeFile::writeCurrentTime(Ostream& os) const
 {
    const scalar timeValue =
    (
--- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H
+++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H
@ -186,7 +186,7 @@ public:
        virtual void writeHeader(Ostream& os, const string& str) const;

        //- Write the current time to stream
-        virtual void writeTime(Ostream& os) const;
+        virtual void writeCurrentTime(Ostream& os) const;

        //- Write a break marker to the stream
        virtual void writeBreak(Ostream& os) const;
--- a/src/functionObjects/field/blendingFactor/blendingFactor.C
+++ b/src/functionObjects/field/blendingFactor/blendingFactor.C
@ -174,7 +174,7 @@ bool Foam::functionObjects::blendingFactor::write()
            << "    blended cells  :  " << nCellsBlended << nl
            << endl;

-        writeTime(file());
+        writeCurrentTime(file());

        file()
            << token::TAB << nCellsScheme1
--- a/src/functionObjects/field/continuityError/continuityError.C
+++ b/src/functionObjects/field/continuityError/continuityError.C
@ -121,7 +121,7 @@ bool Foam::functionObjects::continuityError::write()

    Ostream& os = file();

-    writeTime(os);
+    writeCurrentTime(os);

    os  << local << tab
        << global << tab
--- a/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
+++ b/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
@ -86,7 +86,7 @@ void Foam::functionObjects::fieldExtents::calcFieldExtents

    Log << "field: " << fieldName << nl;

-    writeTime(file());
+    writeCurrentTime(file());

    tmp<volScalarField> tmask = calcMask<Type>(*fieldPtr);
    const volScalarField& mask = tmask();
--- a/src/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.C
@ -152,7 +152,7 @@ bool Foam::functionObjects::fieldMinMax::write()
 {
    writeFileHeader(file());

-    if (!location_) writeTime(file());
+    if (!location_) writeCurrentTime(file());
    Log << type() << " " << name() <<  " write:" << nl;

    for (const word& fieldName : fieldSet_.selectionNames())
--- a/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
@ -50,7 +50,7 @@ void Foam::functionObjects::fieldMinMax::output

    if (location_)
    {
-        writeTime(file());
+        writeCurrentTime(file);

        writeTabbed(file, fieldName);

--- a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
+++ b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
@ -160,7 +160,7 @@ bool Foam::functionObjects::fieldValues::fieldValueDelta::write()
    region1Ptr_->write();
    region2Ptr_->write();

-    writeTime(file());
+    writeCurrentTime(file());

    Log << type() << " " << name() << " write:" << endl;

--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
@ -992,7 +992,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()

    if (operation_ != opNone)
    {
-        writeTime(file());
+        writeCurrentTime(file());
    }

    if (writeArea_)
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
@ -254,7 +254,7 @@ bool Foam::functionObjects::fieldValues::volFieldValue::write()

    if (Pstream::master())
    {
-        writeTime(file());
+        writeCurrentTime(file());
    }

    // Only some operations need the cell volume
--- a/src/functionObjects/field/momentum/momentum.C
+++ b/src/functionObjects/field/momentum/momentum.C
@ -334,7 +334,7 @@ void Foam::functionObjects::momentum::writeValues(Ostream& os)

    if (writeToFile())
    {
-        writeTime(os);
+        writeCurrentTime(os);

        os << tab << sumMomentum_;

--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
@ -728,7 +728,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::write()

    if (writeToFile_)
    {
-        writeTime(file());
+        writeCurrentTime(file());

        file()
            << tab << nCellsScheme1
--- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
+++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
@ -285,7 +285,7 @@ bool Foam::functionObjects::wallHeatFlux::write()

        if (Pstream::master())
        {
-            writeTime(file());
+            writeCurrentTime(file());

            file()
                << token::TAB << pp.name()
--- a/src/functionObjects/field/wallShearStress/wallShearStress.C
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.C
@ -245,7 +245,7 @@ bool Foam::functionObjects::wallShearStress::write()

        if (Pstream::master())
        {
-            writeTime(file());
+            writeCurrentTime(file());

            file()
                << token::TAB << pp.name()
--- a/src/functionObjects/field/yPlus/yPlus.C
+++ b/src/functionObjects/field/yPlus/yPlus.C
@ -216,7 +216,7 @@ bool Foam::functionObjects::yPlus::write()
                    << " y+ : min = " << minYplus << ", max = " << maxYplus
                    << ", average = " << avgYplus << nl;

-                writeTime(file());
+                writeCurrentTime(file());
                file()
                    << token::TAB << patch.name()
                    << token::TAB << minYplus
--- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
@ -209,7 +209,7 @@ void Foam::functionObjects::forceCoeffs::writeBinData
    Ostream& os
 ) const
 {
-    writeTime(os);
+    writeCurrentTime(os);

    for (label bini = 0; bini < nBin_; ++bini)
    {
@ -411,7 +411,7 @@ bool Foam::functionObjects::forceCoeffs::execute()

    if (writeToFile())
    {
-        writeTime(coeffFilePtr_());
+        writeCurrentTime(coeffFilePtr_());
        coeffFilePtr_()
            << tab << CdTot << tab << CsTot << tab << ClTot
            << tab << CmRollTot << tab << CmPitchTot << tab << CmYawTot
--- a/src/functionObjects/forces/forces/forces.C
+++ b/src/functionObjects/forces/forces/forces.C
@ -601,7 +601,7 @@ void Foam::functionObjects::forces::writeIntegratedForceMoment
    {
        Ostream& os = osPtr();

-        writeTime(os);
+        writeCurrentTime(os);

        os  << tab << total
            << tab << pressure
@ -668,7 +668,7 @@ void Foam::functionObjects::forces::writeBinnedForceMoment

    Ostream& os = osPtr();

-    writeTime(os);
+    writeCurrentTime(os);

    forAll(f[0], i)
    {
--- a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C
+++ b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C
@ -147,7 +147,7 @@ bool Foam::functionObjects::cloudInfo::write()
        {
            auto& os = files(cloudi);

-            writeTime(os);
+            writeCurrentTime(os);
            os
                << token::TAB << nTotParcels
                << token::TAB << totMass
--- a/src/functionObjects/utilities/solverInfo/solverInfo.C
+++ b/src/functionObjects/utilities/solverInfo/solverInfo.C
@ -182,7 +182,7 @@ bool Foam::functionObjects::solverInfo::execute()
        initialised_ = true;
    }

-    writeTime(file());
+    writeCurrentTime(file());

    for (const word& fieldName : fieldSet_.selectionNames())
    {
--- a/src/functionObjects/utilities/timeInfo/timeInfo.C
+++ b/src/functionObjects/utilities/timeInfo/timeInfo.C
@ -103,7 +103,7 @@ bool Foam::functionObjects::timeInfo::write()
 {
    if (Pstream::master())
    {
-        writeTime(file());
+        writeCurrentTime(file());

        const scalar cpuTimeNow(time_.elapsedCpuTime());
        const scalar clockTimeNow(time_.elapsedClockTime());
--- a/src/sixDoFRigidBodyState/sixDoFRigidBodyState.C
+++ b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.C
@ -165,7 +165,7 @@ bool Foam::functionObjects::sixDoFRigidBodyState::write()
        }
    }

-    writeTime(file());
+    writeCurrentTime(file());
    file()
        << tab
        << motion.centreOfRotation()  << tab
--- a/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.C
+++ b/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.C
@ -120,7 +120,7 @@ bool Foam::functionObjects::specieReactionRates<ChemistryModelType>::write()

    for (label ri=0; ri<nReaction; ri++)
    {
-        writeTime(file());
+        writeCurrentTime(file());
        file() << token::TAB << ri;

        for (label si=0; si<nSpecie; si++)