Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-dev

This commit is contained in:
Henry Weller
2016-06-09 14:52:04 +01:00
parent acb335bda0
commit 2c61071f99
8 changed files with 60 additions and 296 deletions

View File

@ -162,8 +162,7 @@ Foam::functionObjects::yPlus::yPlus
const dictionary& dict
)
:
writeFiles(name, runTime, dict, name),
phiName_("phi")
writeFiles(name, runTime, dict, name)
{
if (!isA<fvMesh>(obr_))
{
@ -207,7 +206,6 @@ Foam::functionObjects::yPlus::~yPlus()
bool Foam::functionObjects::yPlus::read(const dictionary& dict)
{
writeFiles::read(dict);
phiName_ = dict.lookupOrDefault<word>("phi", "phi");
return true;
}

View File

@ -67,12 +67,6 @@ class yPlus
:
public writeFiles
{
// Private data
//- Name of mass/volume flux field (optional, default = phi)
word phiName_;
// Private Member Functions
//- File header information