From ee593c6e829a83c2f91124a16eaec6e05e9cb1c4 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 21 Jan 2010 13:44:13 +0000
Subject: [PATCH] Updated lagrangian intermediate injection model counters for
 parallel usage

---
 .../Templates/KinematicCloud/KinematicCloud.C |  6 ++--
 .../InjectionModel/InjectionModel.C           | 36 ++++++++++---------
 .../InjectionModel/InjectionModel.H           |  6 +++-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 02cbae1f5c..f0c3c5f033 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -269,11 +269,9 @@ void Foam::KinematicCloud<ParcelType>::info() const
 {
     Info<< "Cloud: " << this->name() << nl
         << "    Total number of parcels added   = "
-        << returnReduce(this->injection().parcelsAddedTotal(), sumOp<label>())
-            << nl
+        << this->injection().parcelsAddedTotal() << nl
         << "    Total mass introduced           = "
-        << returnReduce(this->injection().massInjected(), sumOp<scalar>())
-            << nl
+        << this->injection().massInjected() << nl
         << "    Current number of parcels       = "
         << returnReduce(this->size(), sumOp<label>()) << nl
         << "    Current mass in system          = "
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 5c50573752..a7fa9294c6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -219,7 +219,6 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
                 "    const label, "
                 "    const scalar, "
                 "    const scalar, "
-                "    const scalar, "
                 "    const scalar"
                 ")"
             )<< "Unknown parcelBasis type" << nl
@@ -232,18 +231,26 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
 
 
 template<class CloudType>
-void Foam::InjectionModel<CloudType>::postInjectCheck(const label parcelsAdded)
+void Foam::InjectionModel<CloudType>::postInjectCheck
+(
+    const label parcelsAdded,
+    const scalar massAdded
+)
 {
-    if (parcelsAdded > 0)
+    const label allParcelsAdded = returnReduce(parcelsAdded, sumOp<label>());
+
+    if (allParcelsAdded > 0)
     {
-        Pout<< nl
+        Info<< nl
             << "--> Cloud: " << owner_.name() << nl
-            << "    Added " << parcelsAdded
-            << " new parcels" << nl << endl;
+            << "    Added " << allParcelsAdded << " new parcels" << nl << endl;
     }
 
     // Increment total number of parcels added
-    parcelsAddedTotal_ += parcelsAdded;
+    parcelsAddedTotal_ += allParcelsAdded;
+
+    // Increment total mass injected
+    massInjected_ += returnReduce(massAdded, sumOp<scalar>());
 
     // Update time for start of next injection
     time0_ = owner_.db().time().value();
@@ -355,16 +362,12 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     const polyMesh& mesh = owner_.mesh();
 
     // Prepare for next time step
+    label parcelsAdded = 0;
+    scalar massAdded = 0.0;
     label newParcels = 0;
     scalar newVolume = 0.0;
-    prepareForNextTimeStep(time, newParcels, newVolume);
 
-    // Return if no parcels are required
-    if (newParcels == 0)
-    {
-        postInjectCheck(0);
-        return;
-    }
+    prepareForNextTimeStep(time, newParcels, newVolume);
 
     // Duration of injection period during this timestep
     const scalar deltaT =
@@ -374,7 +377,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     const scalar padTime = max(0.0, SOI_ - time0_);
 
     // Introduce new parcels linearly across carrier phase timestep
-    label parcelsAdded = 0;
     for (label parcelI=0; parcelI<newParcels; parcelI++)
     {
         if (validInjection(parcelI))
@@ -425,13 +427,13 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 // Add the new parcel
                 td.cloud().addParticle(pPtr);
 
-                massInjected_ += pPtr->nParticle()*pPtr->mass();
+                massAdded += pPtr->nParticle()*pPtr->mass();
                 parcelsAdded++;
             }
         }
     }
 
-    postInjectCheck(parcelsAdded);
+    postInjectCheck(parcelsAdded, massAdded);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index bd2521eff9..1f8e3ceeeb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -188,7 +188,11 @@ protected:
         );
 
         //- Post injection checks
-        virtual void postInjectCheck(const label parcelsAdded);
+        virtual void postInjectCheck
+        (
+            const label parcelsAdded,
+            const scalar massAdded
+        );
 
 
 public: