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

src/OpenFOAM: Rationalised use of enumerations by using the C++11 scoped form

Browse Source 
for

    db/functionObjects/timeControl/timeControl.H: timeControls
    primitives/bools/Switch/Switch.H: class switchType
    primitives/strings/fileName/fileName.H: fileType
    primitives/strings/wordRe/wordRe.H: compOption
This commit is contained in:
Henry Weller
2018-08-25 07:26:51 +01:00
parent 61c9bc2ee3
commit 8ed92de98c
33 changed files with 271 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ Foam::timeControl::timeControl
:
time_(t),
prefix_(prefix),
timeControl_(ocTimeStep),
timeControl_(timeControls::timeStep),
intervalSteps_(0),
interval_(-1),
executionIndex_(0)
@ -102,28 +102,28 @@ void Foam::timeControl::read(const dictionary& dict)
}
else
{
timeControl_ = ocTimeStep;
timeControl_ = timeControls::timeStep;
}
switch (timeControl_)
{
case ocTimeStep:
case timeControls::timeStep:
{
intervalSteps_ = dict.lookupOrDefault<label>(intervalName, 0);
break;
}
case ocWriteTime:
case ocOutputTime:
case timeControls::writeTime:
case timeControls::outputTime:
{
intervalSteps_ = dict.lookupOrDefault<label>(intervalName, 1);
break;
}
case ocClockTime:
case ocRunTime:
case ocCpuTime:
case ocAdjustableRunTime:
case timeControls::clockTime:
case timeControls::runTime:
case timeControls::cpuTime:
case timeControls::adjustableRunTime:
{
interval_ = readScalar(dict.lookup(intervalName));
break;
@ -141,7 +141,7 @@ bool Foam::timeControl::execute()
{
switch (timeControl_)
{
case ocTimeStep:
case timeControls::timeStep:
{
return
(
@ -151,8 +151,8 @@ bool Foam::timeControl::execute()
break;
}
case ocWriteTime:
case ocOutputTime:
case timeControls::writeTime:
case timeControls::outputTime:
{
if (time_.writeTime())
{
@ -162,8 +162,8 @@ bool Foam::timeControl::execute()
break;
}
case ocRunTime:
case ocAdjustableRunTime:
case timeControls::runTime:
case timeControls::adjustableRunTime:
{
label executionIndex = label
(
@ -182,7 +182,7 @@ bool Foam::timeControl::execute()
break;
}
case ocCpuTime:
case timeControls::cpuTime:
{
label executionIndex = label
(
@ -197,7 +197,7 @@ bool Foam::timeControl::execute()
break;
}
case ocClockTime:
case timeControls::clockTime:
{
label executionIndex = label
(
@ -212,7 +212,7 @@ bool Foam::timeControl::execute()
break;
}
case ocNone:
case timeControls::none:
{
return false;
}