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: writeFile - refactoring and added constructor

Browse Source
This commit is contained in:
Andrew Heather
2019-09-09 09:21:56 +01:00
committed by Mark Olesen
parent 31aad2159f
commit e753125669
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
View File

@ -153,19 +153,34 @@ Foam::Omanip<int> Foam::functionObjects::writeFile::valueWidth
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::functionObjects::writeFile::writeFile(const writeFile& wf)
:
fileObr_(wf.fileObr_),
prefix_(wf.prefix_),
fileName_(wf.fileName_),
filePtr_(),
writePrecision_(wf.writePrecision_),
writeToFile_(wf.writeToFile_),
writtenHeader_(wf.writtenHeader_),
useUserTime_(wf.useUserTime_),
startTime_(wf.startTime_)
{}
Foam::functionObjects::writeFile::writeFile
(
const objectRegistry& obr,
const word& prefix,
const word& file
const fileName& prefix,
const word& name,
const bool writeToFile
)
:
fileObr_(obr),
prefix_(prefix),
fileName_(file),
fileName_(name),
filePtr_(),
writePrecision_(IOstream::defaultPrecision()),
writeToFile_(true),
writeToFile_(writeToFile),
writtenHeader_(false),
useUserTime_(true),
startTime_(obr.time().startTime().value())
@ -175,12 +190,13 @@ Foam::functionObjects::writeFile::writeFile
Foam::functionObjects::writeFile::writeFile
(
const objectRegistry& obr,
const word& prefix,
const word& file,
const dictionary& dict
const fileName& prefix,
const word& name,
const dictionary& dict,
const bool writeToFile
)
:
writeFile(obr, prefix, file)
writeFile(obr, prefix, name, writeToFile)
{
read(dict);
@ -200,7 +216,7 @@ bool Foam::functionObjects::writeFile::read(const dictionary& dict)
// Only write on master
writeToFile_ =
Pstream::master() && dict.lookupOrDefault("writeToFile", true);
Pstream::master() && dict.lookupOrDefault("writeToFile", writeToFile_);
// Use user time, e.g. CA deg in preference to seconds
useUserTime_ = dict.lookupOrDefault("useUserTime", true);

20
src/OpenFOAM/db/functionObjects/writeFile/writeFile.H
View File

@ -68,7 +68,7 @@ protected:
const objectRegistry& fileObr_;
//- Prefix
const word prefix_;
const fileName prefix_;
//- Name of file
word fileName_;
@ -124,9 +124,6 @@ protected:
Omanip<int> valueWidth(const label offset = 0) const;
//- No copy construct
writeFile(const writeFile&) = delete;
//- No copy assignment
void operator=(const writeFile&) = delete;
@ -143,8 +140,9 @@ public:
writeFile
(
const objectRegistry& obr,
const word& prefix,
const word& file = "undefined"
const fileName& prefix,
const word& name = "undefined",
const bool writeToFile = true
);
//- Construct from objectRegistry, prefix, fileName
@ -152,11 +150,15 @@ public:
writeFile
(
const objectRegistry& obr,
const word& prefix,
const word& file,
const dictionary& dict
const fileName& prefix,
const word& name,
const dictionary& dict,
const bool writeToFile = true
);
//- Construct copy
writeFile(const writeFile& wf);
//- Destructor
virtual ~writeFile() = default;