mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
ENH: upgrade from NamedEnum to Enum (issue #515)
This commit is contained in:
@ -41,22 +41,16 @@ namespace Foam
|
||||
dictionary
|
||||
);
|
||||
}
|
||||
|
||||
template<>
|
||||
const char* Foam::NamedEnum
|
||||
<
|
||||
Foam::tabulatedWallFunctions::general::interpolationType,
|
||||
1
|
||||
>::names[] =
|
||||
{
|
||||
"linear"
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
const
|
||||
Foam::NamedEnum<Foam::tabulatedWallFunctions::general::interpolationType, 1>
|
||||
Foam::tabulatedWallFunctions::general::interpolationTypeNames_;
|
||||
const Foam::Enum
|
||||
<
|
||||
Foam::tabulatedWallFunctions::general::interpolationType
|
||||
>
|
||||
Foam::tabulatedWallFunctions::general::interpolationTypeNames_
|
||||
{
|
||||
{ interpolationType::itLinear, "linear" },
|
||||
};
|
||||
|
||||
|
||||
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
|
||||
@ -138,7 +132,7 @@ Foam::tabulatedWallFunctions::general::general
|
||||
)
|
||||
:
|
||||
tabulatedWallFunction(dict, mesh, typeName),
|
||||
interpType_(interpolationTypeNames_[coeffDict_.lookup("interpType")]),
|
||||
interpType_(interpolationTypeNames_.lookup("interpType", coeffDict_)),
|
||||
yPlus_(),
|
||||
uPlus_(),
|
||||
log10YPlus_(coeffDict_.lookup("log10YPlus")),
|
||||
|
||||
@ -63,7 +63,7 @@ SourceFiles
|
||||
#define general_H
|
||||
|
||||
#include "tabulatedWallFunction.H"
|
||||
#include "NamedEnum.H"
|
||||
#include "Enum.H"
|
||||
#include "Switch.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -91,7 +91,7 @@ public:
|
||||
itLinear
|
||||
};
|
||||
|
||||
static const NamedEnum<interpolationType, 1> interpolationTypeNames_;
|
||||
static const Enum<interpolationType> interpolationTypeNames_;
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
Reference in New Issue
Block a user