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: refactor IOobject options

Browse Source 
- IOobjectOption class encapsulates read/write, storage flags for
  lightweight handling, independent of objectRegistry etc.

ENH: add IOobject isReadRequired() and isReadOptional() queries

- encapsulates test of MUST_READ, MUST_READ_IF_MODIFIED,
  READ_IF_PRESENT for convenience / less clutter.

Example,

    if (isReadRequired() || (isReadOptional() && headerOk()))
    {
        ...
    }

Instead of

    if
    (
        (
            readOpt() == IOobject::MUST_READ
         || readOpt() == IOobject::MUST_READ_IF_MODIFIED
        )
     || (readOpt() == IOobject::READ_IF_PRESENT && headerOk())
    )
    {
        ...
    }
This commit is contained in:
Mark Olesen
2022-09-27 13:07:29 +02:00
parent 623c0624fb
commit d938e01d7a
78 changed files with 891 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/functionObjects/utilities/writeObjects/writeObjects.C
View File

@ -55,8 +55,8 @@ const Foam::Enum
>
Foam::functionObjects::writeObjects::writeOptionNames_
({
{ writeOption::AUTO_WRITE, "autoWrite" },
{ writeOption::NO_WRITE, "noWrite" },
{ writeOption::AUTO_WRITE, "autoWrite" },
{ writeOption::ANY_WRITE, "anyWrite" },
});
@ -173,16 +173,7 @@ bool Foam::functionObjects::writeObjects::write()
switch (writeOption_)
{
case AUTO_WRITE:
{
if (obj.writeOpt() != IOobject::AUTO_WRITE)
{
continue;
}
break;
}
case NO_WRITE:
case writeOption::NO_WRITE:
{
if (obj.writeOpt() != IOobject::NO_WRITE)
{
@ -191,7 +182,16 @@ bool Foam::functionObjects::writeObjects::write()
break;
}
case ANY_WRITE:
case writeOption::AUTO_WRITE:
{
if (obj.writeOpt() != IOobject::AUTO_WRITE)
{
continue;
}
break;
}
case writeOption::ANY_WRITE:
{
break;
}

14
src/functionObjects/utilities/writeObjects/writeObjects.H
View File

@ -83,8 +83,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef functionObjects_writeObjects_H
#define functionObjects_writeObjects_H
#ifndef Foam_functionObjects_writeObjects_H
#define Foam_functionObjects_writeObjects_H
#include "functionObject.H"
#include "wordRes.H"
@ -111,14 +111,14 @@ class writeObjects
{
public:
// Public data types
// Public Data Types
//- Re-enumeration defining the write options, based on the original
// ones at IOobject::writeOption
//- Re-enumeration defining the write options,
//- Naming based on the IOobjectOption::writeOption
enum writeOption
{
AUTO_WRITE,
NO_WRITE,
AUTO_WRITE,
ANY_WRITE
};
@ -126,7 +126,7 @@ public:
private:
// Private data
// Private Data
//- Reference to registry
const objectRegistry& obr_;