songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STYLE: More use of constexpr for namespace variables

Browse Source
This commit is contained in:
Andrew Heather 2017-11-03 11:09:17 +00:00
parent 46e8543653
commit f5795afaba
7 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
View File

@ -329,8 +329,8 @@ inline Ostream& endEntry(Ostream& os)
// Useful aliases for tab and newline characters // Useful aliases for tab and newline characters
static const char tab = '\t'; constexpr char tab = '\t';
static const char nl = '\n'; constexpr char nl = '\n';
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
src/OpenFOAM/global/constants/mathematical/mathematicalConstants.H
View File

@ -45,7 +45,7 @@ namespace mathematical
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
static const char* const group = "mathematical"; constexpr const char* const group = "mathematical";
constexpr scalar e(M_E); constexpr scalar e(M_E);
constexpr scalar pi(M_PI); constexpr scalar pi(M_PI);

14
src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
View File

@ -51,13 +51,13 @@ typedef double doubleScalar;
// Largest and smallest scalar values allowed in certain parts of the code. // Largest and smallest scalar values allowed in certain parts of the code.
// (15 is the number of significant figures in an // (15 is the number of significant figures in an
// IEEE double precision number. See limits.h or float.h) // IEEE double precision number. See limits.h or float.h)
static const doubleScalar doubleScalarGREAT = 1.0e+15; constexpr doubleScalar doubleScalarGREAT = 1.0e+15;
static const doubleScalar doubleScalarVGREAT = 1.0e+300; constexpr doubleScalar doubleScalarVGREAT = 1.0e+300;
static const doubleScalar doubleScalarROOTVGREAT = 1.0e+150; constexpr doubleScalar doubleScalarROOTVGREAT = 1.0e+150;
static const doubleScalar doubleScalarSMALL = 1.0e-15; constexpr doubleScalar doubleScalarSMALL = 1.0e-15;
static const doubleScalar doubleScalarROOTSMALL = 3.0e-8; constexpr doubleScalar doubleScalarROOTSMALL = 3.0e-8;
static const doubleScalar doubleScalarVSMALL = 1.0e-300; constexpr doubleScalar doubleScalarVSMALL = 1.0e-300;
static const doubleScalar doubleScalarROOTVSMALL = 1.0e-150; constexpr doubleScalar doubleScalarROOTVSMALL = 1.0e-150;
#define Scalar doubleScalar #define Scalar doubleScalar

14
src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
View File

@ -51,13 +51,13 @@ typedef float floatScalar;
// Largest and smallest scalar values allowed in certain parts of the code. // Largest and smallest scalar values allowed in certain parts of the code.
// (6 is the number of significant figures in an // (6 is the number of significant figures in an
// IEEE single precision number. See limits.h or float.h) // IEEE single precision number. See limits.h or float.h)
static const floatScalar floatScalarGREAT = 1.0e+6; constexpr floatScalar floatScalarGREAT = 1.0e+6;
static const floatScalar floatScalarVGREAT = 1.0e+37; constexpr floatScalar floatScalarVGREAT = 1.0e+37;
static const floatScalar floatScalarROOTVGREAT = 1.0e+18; constexpr floatScalar floatScalarROOTVGREAT = 1.0e+18;
static const floatScalar floatScalarSMALL = 1.0e-6; constexpr floatScalar floatScalarSMALL = 1.0e-6;
static const floatScalar floatScalarROOTSMALL = 1.0e-3; constexpr floatScalar floatScalarROOTSMALL = 1.0e-3;
static const floatScalar floatScalarVSMALL = 1.0e-37; constexpr floatScalar floatScalarVSMALL = 1.0e-37;
static const floatScalar floatScalarROOTVSMALL = 1.0e-18; constexpr floatScalar floatScalarROOTVSMALL = 1.0e-18;
#define Scalar floatScalar #define Scalar floatScalar

28
src/OpenFOAM/primitives/Scalar/scalar/scalar.H
View File

@ -49,13 +49,13 @@ namespace Foam
{ {
typedef floatScalar scalar; typedef floatScalar scalar;
static const scalar GREAT = floatScalarGREAT; constexpr scalar GREAT = floatScalarGREAT;
static const scalar VGREAT = floatScalarVGREAT; constexpr scalar VGREAT = floatScalarVGREAT;
static const scalar ROOTVGREAT = floatScalarROOTVGREAT; constexpr scalar ROOTVGREAT = floatScalarROOTVGREAT;
static const scalar SMALL = floatScalarSMALL; constexpr scalar SMALL = floatScalarSMALL;
static const scalar ROOTSMALL = floatScalarROOTSMALL; constexpr scalar ROOTSMALL = floatScalarROOTSMALL;
static const scalar VSMALL = floatScalarVSMALL; constexpr scalar VSMALL = floatScalarVSMALL;
static const scalar ROOTVSMALL = floatScalarROOTVSMALL; constexpr scalar ROOTVSMALL = floatScalarROOTVSMALL;
scalar readScalar(Istream& is); scalar readScalar(Istream& is);
@ -73,13 +73,13 @@ namespace Foam
{ {
typedef doubleScalar scalar; typedef doubleScalar scalar;
static const scalar GREAT = doubleScalarGREAT; constexpr scalar GREAT = doubleScalarGREAT;
static const scalar VGREAT = doubleScalarVGREAT; constexpr scalar VGREAT = doubleScalarVGREAT;
static const scalar ROOTVGREAT = doubleScalarROOTVGREAT; constexpr scalar ROOTVGREAT = doubleScalarROOTVGREAT;
static const scalar SMALL = doubleScalarSMALL; constexpr scalar SMALL = doubleScalarSMALL;
static const scalar ROOTSMALL = doubleScalarROOTSMALL; constexpr scalar ROOTSMALL = doubleScalarROOTSMALL;
static const scalar VSMALL = doubleScalarVSMALL; constexpr scalar VSMALL = doubleScalarVSMALL;
static const scalar ROOTVSMALL = doubleScalarROOTVSMALL; constexpr scalar ROOTVSMALL = doubleScalarROOTVSMALL;
scalar readScalar(Istream& is); scalar readScalar(Istream& is);

4
src/OpenFOAM/primitives/ints/label/label.H
View File

@ -58,8 +58,8 @@ namespace Foam
typedef INT_SIZE(int, _t) label; typedef INT_SIZE(int, _t) label;
static const label labelMin = INT_SIZE(INT, _MIN); constexpr label labelMin = INT_SIZE(INT, _MIN);
static const label labelMax = INT_SIZE(INT, _MAX); constexpr label labelMax = INT_SIZE(INT, _MAX);
//- Read label from stream. //- Read label from stream.
// Uses readInt32 or readInt64 according to WM_LABEL_SIZE // Uses readInt32 or readInt64 according to WM_LABEL_SIZE

2
src/OpenFOAM/primitives/ints/uLabel/uLabel.H
View File

@ -58,7 +58,7 @@ namespace Foam
typedef UINT_SIZE(uint, _t) uLabel; typedef UINT_SIZE(uint, _t) uLabel;
static const uLabel uLabelMax = UINT_SIZE(UINT, _MAX); constexpr uLabel uLabelMax = UINT_SIZE(UINT, _MAX);
//- Read uLabel from stream. //- Read uLabel from stream.
// Uses readUint32 or readUint64 according to WM_LABEL_SIZE // Uses readUint32 or readUint64 according to WM_LABEL_SIZE