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

34
src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
View File

@ -137,8 +137,8 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
// Knock out any cell not in patchRegions
forAll(liquidCore, celli)
{
label regionI = regions[celli];
if (patchRegions.found(regionI))
label regioni = regions[celli];
if (patchRegions.found(regioni))
{
backgroundAlpha[celli] = 0;
}
@ -146,7 +146,7 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
{
liquidCore[celli] = 0;
scalar regionVol = regionVolume[regionI];
scalar regionVol = regionVolume[regioni];
if (regionVol < maxDropletVol)
{
backgroundAlpha[celli] = 0;
@ -598,10 +598,10 @@ bool Foam::functionObjects::regionSizeDistribution::write()
<< endl;
forAllConstIter(Map<label>, patchRegions, iter)
{
label regionI = iter.key();
label regioni = iter.key();
Info<< " " << token::TAB << iter.key()
<< token::TAB << allRegionVolume[regionI]
<< token::TAB << allRegionAlphaVolume[regionI] << endl;
<< token::TAB << allRegionVolume[regioni]
<< token::TAB << allRegionAlphaVolume[regioni] << endl;
}
Info<< endl;
@ -658,17 +658,17 @@ bool Foam::functionObjects::regionSizeDistribution::write()
// threshold
forAllIter(Map<scalar>, allRegionVolume, vIter)
{
label regionI = vIter.key();
label regioni = vIter.key();
if
(
patchRegions.found(regionI)
patchRegions.found(regioni)
|| vIter() >= maxDropletVol
|| (allRegionAlphaVolume[regionI]/vIter() < threshold_)
|| (allRegionAlphaVolume[regioni]/vIter() < threshold_)
)
{
allRegionVolume.erase(vIter);
allRegionAlphaVolume.erase(regionI);
allRegionNumCells.erase(regionI);
allRegionAlphaVolume.erase(regioni);
allRegionNumCells.erase(regioni);
}
}
@ -791,11 +791,11 @@ bool Foam::functionObjects::regionSizeDistribution::write()
<< endl;
scalar delta = 0.0;
forAll(binDownCount, binI)
forAll(binDownCount, bini)
{
Info<< " " << token::TAB << binI
Info<< " " << token::TAB << bini
<< token::TAB << delta
<< token::TAB << binDownCount[binI] << endl;
<< token::TAB << binDownCount[bini] << endl;
delta += deltaX;
}
Info<< endl;
@ -844,11 +844,11 @@ bool Foam::functionObjects::regionSizeDistribution::write()
<< endl;
scalar diam = 0.0;
forAll(binCount, binI)
forAll(binCount, bini)
{
Info<< " " << token::TAB << binI
Info<< " " << token::TAB << bini
<< token::TAB << diam
<< token::TAB << binCount[binI] << endl;
<< token::TAB << binCount[bini] << endl;
diam += delta;
}

6
src/functionObjects/field/regionSizeDistribution/regionSizeDistributionTemplates.C
View File

@ -41,12 +41,12 @@ Foam::Map<Type> Foam::functionObjects::regionSizeDistribution::regionSum
forAll(fld, celli)
{
label regionI = regions[celli];
label regioni = regions[celli];
typename Map<Type>::iterator fnd = regionToSum.find(regionI);
typename Map<Type>::iterator fnd = regionToSum.find(regioni);
if (fnd == regionToSum.end())
{
regionToSum.insert(regionI, fld[celli]);
regionToSum.insert(regioni, fld[celli]);
}
else
{