zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: Refactored function objects to make use of new base class

Browse Source
This commit is contained in:
andy
2012-10-15 17:59:38 +01:00
parent d8321469e9
commit 72d49281ce
27 changed files with 225 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
View File

@ -472,24 +472,21 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
}
void Foam::fieldValues::faceSource::writeFileHeader()
void Foam::fieldValues::faceSource::writeFileHeader(const label i)
{
if (outputFilePtr_.valid())
file()
<< "# Source : " << sourceTypeNames_[source_] << " "
<< sourceName_ << nl << "# Faces : " << nFaces_ << nl
<< "# Time" << tab << "sum(magSf)";
forAll(fields_, i)
{
outputFilePtr_()
<< "# Source : " << sourceTypeNames_[source_] << " "
<< sourceName_ << nl << "# Faces : " << nFaces_ << nl
<< "# Time" << tab << "sum(magSf)";
forAll(fields_, i)
{
outputFilePtr_()
<< tab << operationTypeNames_[operation_]
<< "(" << fields_[i] << ")";
}
outputFilePtr_() << endl;
file()
<< tab << operationTypeNames_[operation_]
<< "(" << fields_[i] << ")";
}
file() << endl;
}
@ -532,7 +529,7 @@ Foam::fieldValues::faceSource::faceSource
const bool loadFromFiles
)
:
fieldValue(name, obr, dict, loadFromFiles),
fieldValue(name, obr, dict, typeName, loadFromFiles),
surfaceWriterPtr_(NULL),
source_(sourceTypeNames_.read(dict.lookup("source"))),
operation_(operationTypeNames_.read(dict.lookup("operation"))),
@ -586,7 +583,7 @@ void Foam::fieldValues::faceSource::write()
if (Pstream::master())
{
outputFilePtr_() << obr_.time().value() << tab << totalArea;
file() << obr_.time().value() << tab << totalArea;
}
forAll(fields_, i)
@ -600,7 +597,7 @@ void Foam::fieldValues::faceSource::write()
if (Pstream::master())
{
outputFilePtr_()<< endl;
file()<< endl;
}
if (log_)

2
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
View File

@ -296,7 +296,7 @@ protected:
) const;
//- Output file header information
virtual void writeFileHeader();
virtual void writeFileHeader(const label i);
public:

17
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
View File

@ -269,19 +269,8 @@ bool Foam::fieldValues::faceSource::writeValues(const word& fieldName)
combineMeshGeometry(faces, points);
}
fileName outputDir;
if (Pstream::parRun())
{
// Put in undecomposed case (Note: gives problems for
// distributed data running)
outputDir = obr_.time().path()/".."/name_;
}
else
{
outputDir = obr_.time().path()/name_;
}
outputDir = outputDir/"surface"/obr_.time().timeName();
fileName outputDir =
baseFileDir()/name_/"surface"/obr_.time().timeName();
surfaceWriterPtr_->write
(
@ -302,7 +291,7 @@ bool Foam::fieldValues::faceSource::writeValues(const word& fieldName)
{
Type result = processValues(values, Sf, weightField);
outputFilePtr_()<< tab << result;
file()<< tab << result;
if (log_)
{