From 31aad2159fbe5429ae6a4d9233cf122250495eb8 Mon Sep 17 00:00:00 2001 From: Andrew Heather <> Date: Mon, 9 Sep 2019 09:19:38 +0100 Subject: [PATCH] STYLE: writeFile - renamed writeTime to writeCurrentTime to avoid conflicts --- .../functionObjects/sizeDistribution/sizeDistribution.C | 2 +- src/OpenFOAM/db/functionObjects/writeFile/writeFile.C | 2 +- src/OpenFOAM/db/functionObjects/writeFile/writeFile.H | 2 +- src/functionObjects/field/blendingFactor/blendingFactor.C | 2 +- src/functionObjects/field/continuityError/continuityError.C | 2 +- .../field/fieldExtents/fieldExtentsTemplates.C | 2 +- src/functionObjects/field/fieldMinMax/fieldMinMax.C | 2 +- src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C | 2 +- .../field/fieldValues/fieldValueDelta/fieldValueDelta.C | 2 +- .../field/fieldValues/surfaceFieldValue/surfaceFieldValue.C | 2 +- .../field/fieldValues/volFieldValue/volFieldValue.C | 2 +- src/functionObjects/field/momentum/momentum.C | 2 +- .../field/stabilityBlendingFactor/stabilityBlendingFactor.C | 2 +- src/functionObjects/field/wallHeatFlux/wallHeatFlux.C | 2 +- src/functionObjects/field/wallShearStress/wallShearStress.C | 2 +- src/functionObjects/field/yPlus/yPlus.C | 2 +- src/functionObjects/forces/forceCoeffs/forceCoeffs.C | 4 ++-- src/functionObjects/forces/forces/forces.C | 4 ++-- src/functionObjects/lagrangian/cloudInfo/cloudInfo.C | 2 +- src/functionObjects/utilities/solverInfo/solverInfo.C | 2 +- src/functionObjects/utilities/timeInfo/timeInfo.C | 2 +- src/sixDoFRigidBodyState/sixDoFRigidBodyState.C | 2 +- .../functionObjects/specieReactionRates/specieReactionRates.C | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C index ae7dd572ab..76f384a4cf 100644 --- 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; diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C index f29406b804..f0f40a35cc 100644 --- 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 = ( diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H index b14855b789..4af032b85f 100644 --- 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; diff --git a/src/functionObjects/field/blendingFactor/blendingFactor.C b/src/functionObjects/field/blendingFactor/blendingFactor.C index 4e2d28b14c..f1e656a046 100644 --- 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 diff --git a/src/functionObjects/field/continuityError/continuityError.C b/src/functionObjects/field/continuityError/continuityError.C index 07ff284a3e..36e40ac54b 100644 --- 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 diff --git a/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C b/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C index 2eb033f750..75b4689574 100644 --- 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 tmask = calcMask(*fieldPtr); const volScalarField& mask = tmask(); diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/functionObjects/field/fieldMinMax/fieldMinMax.C index 465536eb3b..8ea69b49d2 100644 --- 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()) diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C b/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C index f11343b570..cdc9d0a5a9 100644 --- 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); diff --git a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C index a8bfa70f2c..55819728b4 100644 --- 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; diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C index 43ff53629a..58b381e52e 100644 --- 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_) diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C index 08144db03a..3066f707e8 100644 --- 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 diff --git a/src/functionObjects/field/momentum/momentum.C b/src/functionObjects/field/momentum/momentum.C index a6fe59032b..11950677f9 100644 --- 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_; diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C index cc158c5613..1767ab7314 100644 --- 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 diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C index d5893f5717..cbb48b4a48 100644 --- 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() diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C index aa9fd5eb71..ecc03916f3 100644 --- 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() diff --git a/src/functionObjects/field/yPlus/yPlus.C b/src/functionObjects/field/yPlus/yPlus.C index f4784b8fbd..324a0fe969 100644 --- 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 diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C index 73709c0e06..e55aa3ef07 100644 --- 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 diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C index cb9480d811..750b3c560a 100644 --- 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) { diff --git a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C index 4a01445466..72e2524878 100644 --- 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 diff --git a/src/functionObjects/utilities/solverInfo/solverInfo.C b/src/functionObjects/utilities/solverInfo/solverInfo.C index 240cc0af68..07681805bd 100644 --- 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()) { diff --git a/src/functionObjects/utilities/timeInfo/timeInfo.C b/src/functionObjects/utilities/timeInfo/timeInfo.C index 1b66352234..0498acc936 100644 --- 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()); diff --git a/src/sixDoFRigidBodyState/sixDoFRigidBodyState.C b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.C index 4229f09384..f225aa90a5 100644 --- 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 diff --git a/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.C b/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.C index 7c68382ada..272b358760 100644 --- a/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.C +++ b/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.C @@ -120,7 +120,7 @@ bool Foam::functionObjects::specieReactionRates::write() for (label ri=0; ri