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

COMP: Multiple changes - first clean build after latest merge - UNTESTED

Browse Source
This commit is contained in:
Andrew Heather
2016-09-23 15:36:53 +01:00
parent 9fbd612672
commit b9940cbbb1
311 changed files with 4119 additions and 6540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/functionObjects/field/histogram/histogram.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -50,7 +50,7 @@ void Foam::functionObjects::histogram::writeGraph
{
const wordList fieldNames(1, fieldName);
fileName outputPath = file_.baseTimeDir();
fileName outputPath = baseTimeDir();
mkDir(outputPath);
OFstream graphFile
(
@ -76,7 +76,7 @@ Foam::functionObjects::histogram::histogram
)
:
fvMeshFunctionObject(name, runTime, dict),
file_(obr_, name)
writeFile(obr_, name)
{
read(dict);
}
@ -157,7 +157,7 @@ bool Foam::functionObjects::histogram::write()
x += delta;
}
scalarField volFrac(nBins_, 0);
scalarField data(nBins_, 0);
const scalarField& V = mesh_.V();
forAll(field, celli)
@ -165,29 +165,29 @@ bool Foam::functionObjects::histogram::write()
const label bini = (field[celli] - min_)/delta;
if (bini >= 0 && bini < nBins_)
{
volFrac[bini] += V[celli];
data[bini] += V[celli];
}
}
Pstream::listCombineGather(volFrac, plusEqOp<scalar>());
Pstream::listCombineGather(data, plusEqOp<scalar>());
if (Pstream::master())
{
const scalar sumVol = sum(volFrac);
const scalar sumData = sum(data);
if (sumVol > SMALL)
if (sumData > SMALL)
{
volFrac /= sumVol;
data /= sumData;
const coordSet coords
(
"Volume_Fraction",
fieldName_,
"x",
xBin,
mag(xBin)
);
writeGraph(coords, field.name(), volFrac);
writeGraph(coords, fieldName_, data);
}
}

5
src/functionObjects/field/histogram/histogram.H
View File

@ -87,12 +87,11 @@ namespace functionObjects
class histogram
:
public fvMeshFunctionObject
public fvMeshFunctionObject,
public writeFile
{
// Private data
writeFile file_;
//- Name of field
word fieldName_;