zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: add set/zone support to randomise function object (#2086)

Browse Source
This commit is contained in:
Mark Olesen
2021-05-11 19:51:07 +02:00
parent 3595e6f93c
commit 5eb48c443a
9 changed files with 134 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/finiteVolume/functionObjects/volRegion/volRegion.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016 OpenFOAM Foundation
Copyright (C) 2016-2020 OpenCFD Ltd.
Copyright (C) 2016-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -108,8 +108,8 @@ void Foam::functionObjects::volRegion::calculateCache()
{
FatalErrorInFunction
<< regionTypeNames_[regionType_]
<< "(" << regionName_ << "):" << nl
<< " Region has no cells"
<< '(' << regionName_ << "):" << nl
<< " Region has no cells" << nl
<< exit(FatalError);
}
@ -127,7 +127,7 @@ void Foam::functionObjects::volRegion::writeFileHeader
{
wf.writeCommented(file, "Region");
file<< setw(1) << ':' << setw(1) << ' '
<< regionTypeNames_[regionType_] << " " << regionName_ << endl;
<< regionTypeNames_[regionType_] << ' ' << regionName_ << endl;
wf.writeHeaderValue(file, "Cells", nCells_);
wf.writeHeaderValue(file, "Volume", V_);
}
@ -184,7 +184,7 @@ bool Foam::functionObjects::volRegion::read(const dictionary& dict)
default:
{
FatalIOErrorInFunction(dict)
<< "Unknown region type. Valid region types are:"
<< "Unknown region type. Valid region types: "
<< flatOutput(regionTypeNames_.names()) << nl
<< exit(FatalIOError);
break;

20
src/finiteVolume/functionObjects/volRegion/volRegion.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016 OpenFOAM Foundation
Copyright (C) 2016-2019 OpenCFD Ltd.
Copyright (C) 2016-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -64,7 +64,7 @@ Usage
\table
Property | Description | Required | Default
regionType | Selection type: all/cellSet/cellZone | no | all
name | Name of cellSet/cellZone if required | no |
name | Name of cellSet/cellZone if required | conditional |
\endtable
See also
@ -86,7 +86,7 @@ SourceFiles
namespace Foam
{
// Forward declarations
// Forward Declarations
class fvMesh;
class polyMesh;
class mapPolyMesh;
@ -130,7 +130,7 @@ public:
//- Region type enumeration
enum regionTypes
{
vrtAll, //!< All cells
vrtAll = 0, //!< All cells
vrtCellSet, //!< A cellSet
vrtCellZone //!< A cellZone
};
@ -155,6 +155,9 @@ protected:
// Protected Member Functions
//- Use all cells, not the cellIDs
inline bool useAllCells() const noexcept;
//- Output file header information
void writeFileHeader(const writeFile& wf, Ostream& file) const;
@ -177,13 +180,14 @@ public:
// Member Functions
//- Return the region type
inline const regionTypes& regionType() const;
//- The region type
inline regionTypes regionType() const noexcept;
//- Return the local list of cell IDs
//- Return the local list of cell IDs.
// Empty or invalid for 'all'
const labelList& cellIDs() const;
//- Return the number of cells selected in the region
//- Return the total number of cells selected in the region
inline label nCells() const;
//- Return total volume of the selected region

19
src/finiteVolume/functionObjects/volRegion/volRegionI.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -28,18 +28,15 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
inline const Foam::functionObjects::volRegion::regionTypes&
Foam::functionObjects::volRegion::regionType() const
inline bool Foam::functionObjects::volRegion::useAllCells() const noexcept
{
#ifdef FULLDEBUG
if (requireUpdate_)
{
FatalErrorInFunction
<< "Retrieving cached values that are not up-to-date" << nl
<< exit(FatalError);
}
#endif
return (regionType_ == vrtAll);
}
inline Foam::functionObjects::volRegion::regionTypes
Foam::functionObjects::volRegion::regionType() const noexcept
{
return regionType_;
}