Commit 31aad215 authored by Andrew Heather's avatar Andrew Heather Committed by Mark Olesen
Browse files

STYLE: writeFile - renamed writeTime to writeCurrentTime to avoid conflicts

parent 1b17784a
......@@ -415,7 +415,7 @@ bool Foam::functionObjects::sizeDistribution::execute()
bool Foam::functionObjects::sizeDistribution::write()
{
writeFileHeader();
writeTime(file());
writeCurrentTime(file());
Log << type() << " " << name() << " write" << nl;
......
......@@ -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 =
(
......
......@@ -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;
......
......@@ -174,7 +174,7 @@ bool Foam::functionObjects::blendingFactor::write()
<< " blended cells : " << nCellsBlended << nl
<< endl;
writeTime(file());
writeCurrentTime(file());
file()
<< token::TAB << nCellsScheme1
......
......@@ -121,7 +121,7 @@ bool Foam::functionObjects::continuityError::write()
Ostream& os = file();
writeTime(os);
writeCurrentTime(os);
os << local << tab
<< global << tab
......
......@@ -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();
......
......@@ -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())
......
......@@ -50,7 +50,7 @@ void Foam::functionObjects::fieldMinMax::output
if (location_)
{
writeTime(file());
writeCurrentTime(file);
writeTabbed(file, fieldName);
......
......@@ -160,7 +160,7 @@ bool Foam::functionObjects::fieldValues::fieldValueDelta::write()
region1Ptr_->write();
region2Ptr_->write();
writeTime(file());
writeCurrentTime(file());
Log << type() << " " << name() << " write:" << endl;
......
......@@ -992,7 +992,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
if (operation_ != opNone)
{
writeTime(file());
writeCurrentTime(file());
}
if (writeArea_)
......
......@@ -254,7 +254,7 @@ bool Foam::functionObjects::fieldValues::volFieldValue::write()
if (Pstream::master())
{
writeTime(file());
writeCurrentTime(file());
}
// Only some operations need the cell volume
......
......@@ -334,7 +334,7 @@ void Foam::functionObjects::momentum::writeValues(Ostream& os)
if (writeToFile())
{
writeTime(os);
writeCurrentTime(os);
os << tab << sumMomentum_;
......
......@@ -728,7 +728,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::write()
if (writeToFile_)
{
writeTime(file());
writeCurrentTime(file());
file()
<< tab << nCellsScheme1
......
......@@ -285,7 +285,7 @@ bool Foam::functionObjects::wallHeatFlux::write()
if (Pstream::master())
{
writeTime(file());
writeCurrentTime(file());
file()
<< token::TAB << pp.name()
......
......@@ -245,7 +245,7 @@ bool Foam::functionObjects::wallShearStress::write()
if (Pstream::master())
{
writeTime(file());
writeCurrentTime(file());
file()
<< token::TAB << pp.name()
......
......@@ -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
......
......@@ -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
......
......@@ -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)
{
......
......@@ -147,7 +147,7 @@ bool Foam::functionObjects::cloudInfo::write()
{
auto& os = files(cloudi);
writeTime(os);
writeCurrentTime(os);
os
<< token::TAB << nTotParcels
<< token::TAB << totMass
......
......@@ -182,7 +182,7 @@ bool Foam::functionObjects::solverInfo::execute()
initialised_ = true;
}
writeTime(file());
writeCurrentTime(file());
for (const word& fieldName : fieldSet_.selectionNames())
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment