zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: function objects - enabled 'fields' entry to use patterns for some objects

Browse Source
This commit is contained in:
Andrew Heather
2017-11-07 17:33:09 +00:00
parent c1b7854cf7
commit ec9a7cc016
24 changed files with 1043 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/functionObjects/utilities/residuals/residuals.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -46,15 +46,26 @@ namespace functionObjects
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
void Foam::functionObjects::residuals::writeFileHeader(Ostream& os) const
void Foam::functionObjects::residuals::writeFileHeader(Ostream& os)
{
writeHeader(os, "Residuals");
if (!fieldSet_.updateSelection())
{
return;
}
if (writtenHeader_)
{
writeBreak(file());
}
else
{
writeHeader(os, "Residuals");
}
writeCommented(os, "Time");
forAll(fieldSet_, fieldi)
for (const word& fieldName : fieldSet_.selection())
{
const word& fieldName = fieldSet_[fieldi];
writeFileHeader<scalar>(os, fieldName);
writeFileHeader<vector>(os, fieldName);
writeFileHeader<sphericalTensor>(os, fieldName);
@ -63,6 +74,8 @@ void Foam::functionObjects::residuals::writeFileHeader(Ostream& os) const
}
os << endl;
writtenHeader_ = true;
}
@ -77,10 +90,9 @@ Foam::functionObjects::residuals::residuals
:
fvMeshFunctionObject(name, runTime, dict),
writeFile(obr_, name, typeName, dict),
fieldSet_()
fieldSet_(mesh_)
{
read(dict);
writeFileHeader(file());
}
@ -94,13 +106,13 @@ Foam::functionObjects::residuals::~residuals()
bool Foam::functionObjects::residuals::read(const dictionary& dict)
{
fvMeshFunctionObject::read(dict);
if (fvMeshFunctionObject::read(dict))
{
fieldSet_.read(dict);
return true;
}
wordList allFields(dict.lookup("fields"));
wordHashSet uniqueFields(allFields);
fieldSet_ = uniqueFields.toc();
return true;
return false;
}
@ -114,12 +126,12 @@ bool Foam::functionObjects::residuals::write()
{
if (Pstream::master())
{
writeFileHeader(file());
writeTime(file());
forAll(fieldSet_, fieldi)
for (const word& fieldName : fieldSet_.selection())
{
const word& fieldName = fieldSet_[fieldi];
writeResidual<scalar>(fieldName);
writeResidual<vector>(fieldName);
writeResidual<sphericalTensor>(fieldName);

7
src/functionObjects/utilities/residuals/residuals.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -62,6 +62,7 @@ SourceFiles
#include "fvMeshFunctionObject.H"
#include "writeFile.H"
#include "solverFieldSelection.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -84,13 +85,13 @@ protected:
// Protected data
//- Fields to write residuals
wordList fieldSet_;
solverFieldSelection fieldSet_;
// Protected Member Functions
//- Output file header information
void writeFileHeader(Ostream& os) const;
void writeFileHeader(Ostream& os);
//- Output file header information per primitive type value
template<class Type>