COMP: Multiple changes - first clean build after latest merge - UNTESTED

This commit is contained in:
Andrew Heather
2016-09-23 15:36:53 +01:00
parent 9fbd612672
commit b9940cbbb1
311 changed files with 4119 additions and 6540 deletions

View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -40,7 +40,7 @@ void Foam::functionObjects::logFiles::createFiles()
{
if (!filePtrs_.set(i))
{
filePtrs_.set(i, createFile(names_[i]);
filePtrs_.set(i, createFile(names_[i]));
initStream(filePtrs_[i]);
}
@ -67,7 +67,7 @@ void Foam::functionObjects::logFiles::resetName(const word& name)
names_.clear();
names_.append(name);
resetFile(name);
writeFile::resetFile(name);
}
@ -85,6 +85,21 @@ Foam::functionObjects::logFiles::logFiles
{}
Foam::functionObjects::logFiles::logFiles
(
const objectRegistry& obr,
const word& prefix,
const dictionary& dict
)
:
writeFile(obr, prefix),
names_(),
filePtrs_()
{
writeFile::read(dict);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::logFiles::~logFiles()

View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -41,7 +41,6 @@ SourceFiles
#define functionObjects_logFiles_H
#include "writeFile.H"
#include "OFstream.H"
#include "PtrList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -82,9 +81,6 @@ protected:
//- Reset the list of names to a single name entry
virtual void resetName(const word& name);
//- File header information
virtual void writeFileHeader(const label i = 0) = 0;
private:
@ -109,6 +105,16 @@ public:
);
//- Construct from objectRegistry and prefix, and read options
// from dictionary
logFiles
(
const objectRegistry& obr,
const word& prefix,
const dictionary& dict
);
//- Destructor
virtual ~logFiles();