From 7eb40198779ee0f5be79e5a889f65e9ad66a05cf Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 25 Aug 2009 17:57:06 +0100
Subject: [PATCH] improved pdfPlot utility

---
 .../miscellaneous/pdfPlot/Make/options        |  8 ++--
 .../miscellaneous/pdfPlot/createFields.H      | 19 ++------
 .../miscellaneous/pdfPlot/pdfDict             | 35 ++++++++++++++
 .../miscellaneous/pdfPlot/pdfPlot.C           | 46 +++++++++++--------
 4 files changed, 72 insertions(+), 36 deletions(-)
 create mode 100644 applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict

diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options b/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options
index f248721341..a140053895 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options
@@ -1,6 +1,8 @@
 EXE_INC = \
-     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
-    -lpdf
+    -lpdf \
+    -lsampling
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
index c9255fc4cf..2dc6e7af70 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
@@ -2,7 +2,7 @@
     (
         IOobject
         (
-            "pdfDictionary",
+            "pdfDict",
             runTime.constant(),
             runTime,
             IOobject::MUST_READ,
@@ -10,20 +10,9 @@
         )
     );
 
-    label nIntervals
-    (
-        readLabel(pdfDictionary.lookup("nIntervals"))
-    );
+    label nIntervals(readLabel(pdfDictionary.lookup("nIntervals")));
 
-    label nSamples
-    (
-        readLabel(pdfDictionary.lookup("nSamples"))
-    );
+    label nSamples(readLabel(pdfDictionary.lookup("nSamples")));
 
-    label samples[nIntervals];
-
-    for(label i=0;i<nIntervals;i++)
-    {
-        samples[i] = 0;
-    }
+    scalarField samples(nIntervals, 0);
 
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict
new file mode 100644
index 0000000000..2a48115bea
--- /dev/null
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict
@@ -0,0 +1,35 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      pdfDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Number of intervals/bins in pdf plot
+nIntervals      20;
+
+// Number of samples
+nSamples        10000;
+
+// Type of pdf
+pdfType         RosinRammler;
+
+RosinRammlerPDF
+{
+    minValue        1e-06;
+    maxValue        200e-06;
+    d               (60.0e-06);
+    n               (0.8);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
index 0bd05727d7..09e85cb649 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
@@ -23,50 +23,60 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    Generates an .obj file to plot a probability distribution function
+    Generates a graph of a probability distribution function
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "pdf.H"
-#include "OFstream.H"
+#include "makeGraph.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
 int main(int argc, char *argv[])
 {
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createFields.H"
 
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createFields.H"
-
-    OFstream objFileNew("s.m");
+    fileName pdfPath = runTime.path()/"pdf";
+    mkDir(pdfPath);
 
     Random rndGen(label(0));
 
-    autoPtr<pdf> p
-    (
-        pdf::New(pdfDictionary, rndGen)
-    );
+    autoPtr<pdf> p(pdf::New(pdfDictionary, rndGen));
 
     scalar xMin = p->minValue();
-
     scalar xMax = p->maxValue();
 
-    for(label i=0;i<nSamples;i++)
+    label iCheck = 100;
+    for (label i=1; i<=nSamples; i++)
     {
         scalar ps = p->sample();
-        label n = label((ps-xMin)*nIntervals/(xMax-xMin));
-        //Info << "p[" << i << "] = " << ps << ", n = " << n << endl;
+        label n = label((ps - xMin)*nIntervals/(xMax - xMin));
         samples[n]++;
+
+        if (i % iCheck == 0)
+        {
+            Info<< "    processed " << i << " samples" << endl;
+
+            if (i == 10*iCheck)
+            {
+                iCheck *= 10;
+            }
+        }
     }
 
-    for(label i=0;i<nIntervals;i++)
+    scalarField x(nIntervals);
+
+    forAll(x, i)
     {
-        scalar x = xMin + i*(xMax-xMin)/(nIntervals-1);
-        objFileNew << x << " \t" << samples[i] << endl;
+        x[i] = xMin + i*(xMax - xMin)/(nIntervals - 1);
     }
+
+    makeGraph(x, samples, p->type(), pdfPath, runTime.graphFormat());
+
     Info << "End\n" << endl;
 
     return 0;