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

STYLE: consistency updates

Browse Source
This commit is contained in:
Andrew Heather
2016-09-27 15:17:55 +01:00
parent 89d9fd1550
commit 3dbd39146c
242 changed files with 1933 additions and 1933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
View File

@ -64,14 +64,14 @@ Foam::functionObjects::runTimeControls::averageCondition::averageCondition
{
const dictionary& dict = conditionDict();
forAll(fieldNames_, fieldI)
forAll(fieldNames_, fieldi)
{
const word& fieldName = fieldNames_[fieldI];
const word& fieldName = fieldNames_[fieldi];
if (dict.found(fieldName))
{
const dictionary& valueDict = dict.subDict(fieldName);
totalTime_[fieldI] = readScalar(valueDict.lookup("totalTime"));
totalTime_[fieldi] = readScalar(valueDict.lookup("totalTime"));
}
}
}
@ -101,11 +101,11 @@ bool Foam::functionObjects::runTimeControls::averageCondition::apply()
DynamicList<label> unprocessedFields(fieldNames_.size());
forAll(fieldNames_, fieldI)
forAll(fieldNames_, fieldi)
{
const word& fieldName(fieldNames_[fieldI]);
const word& fieldName(fieldNames_[fieldi]);
scalar Dt = totalTime_[fieldI];
scalar Dt = totalTime_[fieldi];
scalar alpha = (Dt - dt)/Dt;
scalar beta = dt/Dt;
@ -133,10 +133,10 @@ bool Foam::functionObjects::runTimeControls::averageCondition::apply()
if (!processed)
{
unprocessedFields.append(fieldI);
unprocessedFields.append(fieldi);
}
totalTime_[fieldI] += dt;
totalTime_[fieldi] += dt;
}
if (unprocessedFields.size())
@ -147,8 +147,8 @@ bool Foam::functionObjects::runTimeControls::averageCondition::apply()
forAll(unprocessedFields, i)
{
label fieldI = unprocessedFields[i];
Info<< " " << fieldNames_[fieldI] << nl;
label fieldi = unprocessedFields[i];
Info<< " " << fieldNames_[fieldi] << nl;
}
}
@ -162,20 +162,20 @@ void Foam::functionObjects::runTimeControls::averageCondition::write()
{
dictionary& conditionDict = this->conditionDict();
forAll(fieldNames_, fieldI)
forAll(fieldNames_, fieldi)
{
const word& fieldName = fieldNames_[fieldI];
const word& fieldName = fieldNames_[fieldi];
// value dictionary should be present - mean values are written there
if (conditionDict.found(fieldName))
{
dictionary& valueDict = conditionDict.subDict(fieldName);
valueDict.add("totalTime", totalTime_[fieldI], true);
valueDict.add("totalTime", totalTime_[fieldi], true);
}
else
{
dictionary valueDict;
valueDict.add("totalTime", totalTime_[fieldI], true);
valueDict.add("totalTime", totalTime_[fieldi], true);
conditionDict.add(fieldName, valueDict);
}
}

14
src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
View File

@ -132,15 +132,15 @@ apply()
List<scalar> result(fieldNames_.size(), -VGREAT);
forAll(fieldNames_, fieldI)
forAll(fieldNames_, fieldi)
{
const word& fieldName = fieldNames_[fieldI];
const word& fieldName = fieldNames_[fieldi];
if (solverDict.found(fieldName))
{
const List<solverPerformance> sp(solverDict.lookup(fieldName));
const scalar residual = sp.first().initialResidual();
result[fieldI] = residual;
result[fieldi] = residual;
switch (mode_)
{
@ -203,14 +203,14 @@ apply()
<< ": satisfied using threshold value: " << value_ << nl;
}
forAll(result, resultI)
forAll(result, resulti)
{
if (result[resultI] > 0)
if (result[resulti] > 0)
{
if (log_)
{
Info<< " field: " << fieldNames_[resultI]
<< ", residual: " << result[resultI] << nl;
Info<< " field: " << fieldNames_[resulti]
<< ", residual: " << result[resulti] << nl;
}
}
}

14
src/functionObjects/utilities/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.C
View File

@ -105,15 +105,15 @@ bool Foam::functionObjects::runTimeControls::equationMaxIterCondition::apply()
List<label> result(fieldNames_.size(), -1);
forAll(fieldNames_, fieldI)
forAll(fieldNames_, fieldi)
{
const word& fieldName = fieldNames_[fieldI];
const word& fieldName = fieldNames_[fieldi];
if (solverDict.found(fieldName))
{
const List<solverPerformance> sp(solverDict.lookup(fieldName));
const label nIterations = sp.first().nIterations();
result[fieldI] = nIterations;
result[fieldi] = nIterations;
if (nIterations > threshold_)
{
@ -154,14 +154,14 @@ bool Foam::functionObjects::runTimeControls::equationMaxIterCondition::apply()
<< ": satisfied using threshold value: " << threshold_ << nl;
}
forAll(result, resultI)
forAll(result, resulti)
{
if (result[resultI] != -1)
if (result[resulti] != -1)
{
if (log_)
{
Info<< " field: " << fieldNames_[resultI]
<< ", iterations: " << result[resultI] << nl;
Info<< " field: " << fieldNames_[resulti]
<< ", iterations: " << result[resulti] << nl;
}
}
}

4
src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
View File

@ -110,9 +110,9 @@ bool Foam::functionObjects::runTimeControls::minMaxCondition::apply()
return satisfied;
}
forAll(fieldNames_, fieldI)
forAll(fieldNames_, fieldi)
{
const word& fieldName = fieldNames_[fieldI];
const word& fieldName = fieldNames_[fieldi];
const word valueType =
state_.objectResultType(functionObjectName_, fieldName);

46
src/functionObjects/utilities/runTimeControl/runTimeControl.C
View File

@ -81,23 +81,23 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::read
const wordList conditionNames(conditionsDict.toc());
conditions_.setSize(conditionNames.size());
label uniqueGroupI = 0;
forAll(conditionNames, conditionI)
label uniqueGroupi = 0;
forAll(conditionNames, conditioni)
{
const word& conditionName = conditionNames[conditionI];
const word& conditionName = conditionNames[conditioni];
const dictionary& dict = conditionsDict.subDict(conditionName);
conditions_.set
(
conditionI,
conditioni,
runTimeCondition::New(conditionName, obr_, dict, *this)
);
label groupI = conditions_[conditionI].groupID();
label groupi = conditions_[conditioni].groupID();
if (groupMap_.insert(groupI, uniqueGroupI))
if (groupMap_.insert(groupi, uniqueGroupi))
{
uniqueGroupI++;
uniqueGroupi++;
}
}
@ -114,9 +114,9 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::read
{
// Check that at least one condition is active
bool active = false;
forAll(conditions_, conditionI)
forAll(conditions_, conditioni)
{
if (conditions_[conditionI].active())
if (conditions_[conditioni].active())
{
active = true;
break;
@ -146,32 +146,32 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
List<bool> groupSatisfied(groupMap_.size(), true);
List<bool> groupActive(groupMap_.size(), false);
forAll(conditions_, conditionI)
forAll(conditions_, conditioni)
{
runTimeCondition& condition = conditions_[conditionI];
runTimeCondition& condition = conditions_[conditioni];
if (condition.active())
{
bool conditionSatisfied = condition.apply();
label groupI = condition.groupID();
label groupi = condition.groupID();
Map<label>::const_iterator conditionIter = groupMap_.find(groupI);
Map<label>::const_iterator conditionIter = groupMap_.find(groupi);
if (conditionIter == groupMap_.end())
{
FatalErrorInFunction
<< "group " << groupI << " not found in map"
<< "group " << groupi << " not found in map"
<< abort(FatalError);
}
if (conditionSatisfied)
{
IDs.append(conditionI);
IDs.append(conditioni);
groupActive[conditionIter()] = true;
if (groupI == -1)
if (groupi == -1)
{
// Condition not part of a group - only requires this to be
// satisfied for completion flag to be set
@ -187,9 +187,9 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
}
bool done = false;
forAll(groupSatisfied, groupI)
forAll(groupSatisfied, groupi)
{
if (groupSatisfied[groupI] && groupActive[groupI])
if (groupSatisfied[groupi] && groupActive[groupi])
{
done = true;
break;
@ -198,10 +198,10 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
if (done)
{
forAll(IDs, conditionI)
forAll(IDs, conditioni)
{
Info<< " " << conditions_[conditionI].type() << ": "
<< conditions_[conditionI].name()
Info<< " " << conditions_[conditioni].type() << ": "
<< conditions_[conditioni].name()
<< " condition satisfied" << nl;
}
@ -235,9 +235,9 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
bool Foam::functionObjects::runTimeControls::runTimeControl::write()
{
forAll(conditions_, conditionI)
forAll(conditions_, conditioni)
{
conditions_[conditionI].write();
conditions_[conditioni].write();
}
return true;