STYLE: writeFile - renamed writeTime to writeCurrentTime to avoid conflicts

This commit is contained in:
Andrew Heather
2019-09-09 09:19:38 +01:00
committed by Mark Olesen
parent 1b17784a1f
commit 31aad2159f
23 changed files with 25 additions and 25 deletions

View File

@ -415,7 +415,7 @@ bool Foam::functionObjects::sizeDistribution::execute()
bool Foam::functionObjects::sizeDistribution::write() bool Foam::functionObjects::sizeDistribution::write()
{ {
writeFileHeader(); writeFileHeader();
writeTime(file()); writeCurrentTime(file());
Log << type() << " " << name() << " write" << nl; Log << type() << " " << name() << " write" << nl;

View File

@ -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 = const scalar timeValue =
( (

View File

@ -186,7 +186,7 @@ public:
virtual void writeHeader(Ostream& os, const string& str) const; virtual void writeHeader(Ostream& os, const string& str) const;
//- Write the current time to stream //- 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 //- Write a break marker to the stream
virtual void writeBreak(Ostream& os) const; virtual void writeBreak(Ostream& os) const;

View File

@ -174,7 +174,7 @@ bool Foam::functionObjects::blendingFactor::write()
<< " blended cells : " << nCellsBlended << nl << " blended cells : " << nCellsBlended << nl
<< endl; << endl;
writeTime(file()); writeCurrentTime(file());
file() file()
<< token::TAB << nCellsScheme1 << token::TAB << nCellsScheme1

View File

@ -121,7 +121,7 @@ bool Foam::functionObjects::continuityError::write()
Ostream& os = file(); Ostream& os = file();
writeTime(os); writeCurrentTime(os);
os << local << tab os << local << tab
<< global << tab << global << tab

View File

@ -86,7 +86,7 @@ void Foam::functionObjects::fieldExtents::calcFieldExtents
Log << "field: " << fieldName << nl; Log << "field: " << fieldName << nl;
writeTime(file()); writeCurrentTime(file());
tmp<volScalarField> tmask = calcMask<Type>(*fieldPtr); tmp<volScalarField> tmask = calcMask<Type>(*fieldPtr);
const volScalarField& mask = tmask(); const volScalarField& mask = tmask();

View File

@ -152,7 +152,7 @@ bool Foam::functionObjects::fieldMinMax::write()
{ {
writeFileHeader(file()); writeFileHeader(file());
if (!location_) writeTime(file()); if (!location_) writeCurrentTime(file());
Log << type() << " " << name() << " write:" << nl; Log << type() << " " << name() << " write:" << nl;
for (const word& fieldName : fieldSet_.selectionNames()) for (const word& fieldName : fieldSet_.selectionNames())

View File

@ -50,7 +50,7 @@ void Foam::functionObjects::fieldMinMax::output
if (location_) if (location_)
{ {
writeTime(file()); writeCurrentTime(file);
writeTabbed(file, fieldName); writeTabbed(file, fieldName);

View File

@ -160,7 +160,7 @@ bool Foam::functionObjects::fieldValues::fieldValueDelta::write()
region1Ptr_->write(); region1Ptr_->write();
region2Ptr_->write(); region2Ptr_->write();
writeTime(file()); writeCurrentTime(file());
Log << type() << " " << name() << " write:" << endl; Log << type() << " " << name() << " write:" << endl;

View File

@ -992,7 +992,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
if (operation_ != opNone) if (operation_ != opNone)
{ {
writeTime(file()); writeCurrentTime(file());
} }
if (writeArea_) if (writeArea_)

View File

@ -254,7 +254,7 @@ bool Foam::functionObjects::fieldValues::volFieldValue::write()
if (Pstream::master()) if (Pstream::master())
{ {
writeTime(file()); writeCurrentTime(file());
} }
// Only some operations need the cell volume // Only some operations need the cell volume

View File

@ -334,7 +334,7 @@ void Foam::functionObjects::momentum::writeValues(Ostream& os)
if (writeToFile()) if (writeToFile())
{ {
writeTime(os); writeCurrentTime(os);
os << tab << sumMomentum_; os << tab << sumMomentum_;

View File

@ -728,7 +728,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::write()
if (writeToFile_) if (writeToFile_)
{ {
writeTime(file()); writeCurrentTime(file());
file() file()
<< tab << nCellsScheme1 << tab << nCellsScheme1

View File

@ -285,7 +285,7 @@ bool Foam::functionObjects::wallHeatFlux::write()
if (Pstream::master()) if (Pstream::master())
{ {
writeTime(file()); writeCurrentTime(file());
file() file()
<< token::TAB << pp.name() << token::TAB << pp.name()

View File

@ -245,7 +245,7 @@ bool Foam::functionObjects::wallShearStress::write()
if (Pstream::master()) if (Pstream::master())
{ {
writeTime(file()); writeCurrentTime(file());
file() file()
<< token::TAB << pp.name() << token::TAB << pp.name()

View File

@ -216,7 +216,7 @@ bool Foam::functionObjects::yPlus::write()
<< " y+ : min = " << minYplus << ", max = " << maxYplus << " y+ : min = " << minYplus << ", max = " << maxYplus
<< ", average = " << avgYplus << nl; << ", average = " << avgYplus << nl;
writeTime(file()); writeCurrentTime(file());
file() file()
<< token::TAB << patch.name() << token::TAB << patch.name()
<< token::TAB << minYplus << token::TAB << minYplus

View File

@ -209,7 +209,7 @@ void Foam::functionObjects::forceCoeffs::writeBinData
Ostream& os Ostream& os
) const ) const
{ {
writeTime(os); writeCurrentTime(os);
for (label bini = 0; bini < nBin_; ++bini) for (label bini = 0; bini < nBin_; ++bini)
{ {
@ -411,7 +411,7 @@ bool Foam::functionObjects::forceCoeffs::execute()
if (writeToFile()) if (writeToFile())
{ {
writeTime(coeffFilePtr_()); writeCurrentTime(coeffFilePtr_());
coeffFilePtr_() coeffFilePtr_()
<< tab << CdTot << tab << CsTot << tab << ClTot << tab << CdTot << tab << CsTot << tab << ClTot
<< tab << CmRollTot << tab << CmPitchTot << tab << CmYawTot << tab << CmRollTot << tab << CmPitchTot << tab << CmYawTot

View File

@ -601,7 +601,7 @@ void Foam::functionObjects::forces::writeIntegratedForceMoment
{ {
Ostream& os = osPtr(); Ostream& os = osPtr();
writeTime(os); writeCurrentTime(os);
os << tab << total os << tab << total
<< tab << pressure << tab << pressure
@ -668,7 +668,7 @@ void Foam::functionObjects::forces::writeBinnedForceMoment
Ostream& os = osPtr(); Ostream& os = osPtr();
writeTime(os); writeCurrentTime(os);
forAll(f[0], i) forAll(f[0], i)
{ {

View File

@ -147,7 +147,7 @@ bool Foam::functionObjects::cloudInfo::write()
{ {
auto& os = files(cloudi); auto& os = files(cloudi);
writeTime(os); writeCurrentTime(os);
os os
<< token::TAB << nTotParcels << token::TAB << nTotParcels
<< token::TAB << totMass << token::TAB << totMass

View File

@ -182,7 +182,7 @@ bool Foam::functionObjects::solverInfo::execute()
initialised_ = true; initialised_ = true;
} }
writeTime(file()); writeCurrentTime(file());
for (const word& fieldName : fieldSet_.selectionNames()) for (const word& fieldName : fieldSet_.selectionNames())
{ {

View File

@ -103,7 +103,7 @@ bool Foam::functionObjects::timeInfo::write()
{ {
if (Pstream::master()) if (Pstream::master())
{ {
writeTime(file()); writeCurrentTime(file());
const scalar cpuTimeNow(time_.elapsedCpuTime()); const scalar cpuTimeNow(time_.elapsedCpuTime());
const scalar clockTimeNow(time_.elapsedClockTime()); const scalar clockTimeNow(time_.elapsedClockTime());

View File

@ -165,7 +165,7 @@ bool Foam::functionObjects::sixDoFRigidBodyState::write()
} }
} }
writeTime(file()); writeCurrentTime(file());
file() file()
<< tab << tab
<< motion.centreOfRotation() << tab << motion.centreOfRotation() << tab

View File

@ -120,7 +120,7 @@ bool Foam::functionObjects::specieReactionRates<ChemistryModelType>::write()
for (label ri=0; ri<nReaction; ri++) for (label ri=0; ri<nReaction; ri++)
{ {
writeTime(file()); writeCurrentTime(file());
file() << token::TAB << ri; file() << token::TAB << ri;
for (label si=0; si<nSpecie; si++) for (label si=0; si<nSpecie; si++)