From e2f2bd1ff19108736c61e9f7152e18a7c2481c8e Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 29 Mar 2010 17:37:10 +0100
Subject: [PATCH] ENH: Updated lagrangian/intermediate lib to use updated pdfs
 library

---
 .../Kinematic/InjectionModel/ConeInjection/ConeInjection.C      | 2 +-
 .../Kinematic/InjectionModel/ConeInjection/ConeInjection.H      | 2 +-
 .../Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C  | 2 +-
 .../Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H  | 2 +-
 .../FieldActivatedInjection/FieldActivatedInjection.C           | 2 +-
 .../FieldActivatedInjection/FieldActivatedInjection.H           | 2 +-
 .../Kinematic/InjectionModel/ManualInjection/ManualInjection.C  | 2 +-
 .../Kinematic/InjectionModel/ManualInjection/ManualInjection.H  | 2 +-
 .../Kinematic/InjectionModel/PatchInjection/PatchInjection.C    | 2 +-
 .../Kinematic/InjectionModel/PatchInjection/PatchInjection.H    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index b9cbf0f921..6d38ad3ba8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -120,7 +120,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
     ),
     parcelPDF_
     (
-        pdf::New
+        pdfs::pdf::New
         (
             this->coeffDict().subDict("parcelPDF"),
             owner.rndGen()
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 5e6498e3d4..41c299b027 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -97,7 +97,7 @@ class ConeInjection
         const autoPtr<DataEntry<scalar> > thetaOuter_;
 
         //- Parcel size PDF model
-        const autoPtr<pdf> parcelPDF_;
+        const autoPtr<pdfs::pdf> parcelPDF_;
 
 
         // Tangential vectors to the direction vector
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
index e59eba322e..8b02e7057a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
@@ -151,7 +151,7 @@ Foam::ConeInjectionMP<CloudType>::ConeInjectionMP
     ),
     parcelPDF_
     (
-        pdf::New
+        pdfs::pdf::New
         (
             this->coeffDict().subDict("parcelPDF"),
             owner.rndGen()
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
index 238d0463ef..a517866689 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
@@ -104,7 +104,7 @@ class ConeInjectionMP
         const autoPtr<DataEntry<scalar> > thetaOuter_;
 
         //- Parcel size PDF model
-        const autoPtr<pdf> parcelPDF_;
+        const autoPtr<pdfs::pdf> parcelPDF_;
 
         //- Number of parcels per injector already injected
         mutable label nInjected_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index a1353be80c..f8599dcceb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -115,7 +115,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
     diameters_(positions_.size()),
     parcelPDF_
     (
-        pdf::New
+        pdfs::pdf::New
         (
             this->coeffDict().subDict("parcelPDF"),
             owner.rndGen()
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index c2f1e3cef4..e58df9c379 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -106,7 +106,7 @@ class FieldActivatedInjection
             scalarList diameters_;
 
             //- Parcel size PDF model
-            const autoPtr<pdf> parcelPDF_;
+            const autoPtr<pdfs::pdf> parcelPDF_;
 
 
 protected:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index ad829f3978..0bf8e62e4d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -94,7 +94,7 @@ Foam::ManualInjection<CloudType>::ManualInjection
     U0_(this->coeffDict().lookup("U0")),
     parcelPDF_
     (
-        pdf::New
+        pdfs::pdf::New
         (
             this->coeffDict().subDict("parcelPDF"),
             owner.rndGen()
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index b04fee48b5..e4642f6124 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -75,7 +75,7 @@ class ManualInjection
         const vector U0_;
 
         //- Parcel size PDF model
-        const autoPtr<pdf> parcelPDF_;
+        const autoPtr<pdfs::pdf> parcelPDF_;
 
         //- Number of particles represented by each parcel
         scalar nParticlesPerParcel_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 4e88b90bfe..198ba8e13d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -93,7 +93,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
     ),
     parcelPDF_
     (
-        pdf::New
+        pdfs::pdf::New
         (
             this->coeffDict().subDict("parcelPDF"),
             owner.rndGen()
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index 05117ce3be..1338d5bbda 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -84,7 +84,7 @@ class PatchInjection
         const autoPtr<DataEntry<scalar> > volumeFlowRate_;
 
         //- Parcel size PDF model
-        const autoPtr<pdf> parcelPDF_;
+        const autoPtr<pdfs::pdf> parcelPDF_;
 
         //- Cell owners
         labelList cellOwners_;