From 1296e86758732a37d4f95df540525903d15bc868 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 4 Mar 2009 14:53:54 +0000
Subject: [PATCH] tidy-up of constrain functions for pos and U

---
 .../InjectionModel/InjectionModel.C           | 28 ++++++-------------
 .../InjectionModel/InjectionModel.H           |  6 ----
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 1a027a4047..a21580845e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -229,24 +229,6 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
 }
 
 
-template<class CloudType>
-void Foam::InjectionModel<CloudType>::geometryCorrection(vector& pos) const
-{
-    meshTools::constrainToMeshCentre(owner_.mesh(), pos);
-}
-
-
-template<class CloudType>
-void Foam::InjectionModel<CloudType>::velocityCorrection(vector& U) const
-{
-    meshTools::constrainDirection
-    (
-        owner_.mesh(),
-        owner_.mesh().solutionD(),
-        U
-    );
-}
-
 template<class CloudType>
 void Foam::InjectionModel<CloudType>::postInjectCheck()
 {
@@ -269,6 +251,7 @@ void Foam::InjectionModel<CloudType>::postInjectCheck()
     // Reset added parcels counter
     parcelsAdded_ = 0;
 
+    // Write current state to properties file
     writeProps();
 }
 
@@ -425,8 +408,13 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 scalar dt = time - timeInj;
 
                 // Apply corrections for 2-D cases
-                geometryCorrection(pos);
-                velocityCorrection(U);
+                meshTools::constrainToMeshCentre(owner_.mesh(), pos);
+                meshTools::constrainDirection
+                (
+                    owner_.mesh(),
+                    owner_.mesh().solutionD(),
+                    U
+                );
 
                 // Add the new parcel
                 td.cloud().addNewParcel(pos, cellI, d, U, nP, dt);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 5c2a00a4d5..a2f0cd1c16 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -88,12 +88,6 @@ private:
         //- Write injector properties
         void writeProps();
 
-        //- Geometry correction for 2-D cases
-        void geometryCorrection(vector& pos) const;
-
-        //- Velocity correction for 2-D cases
-        void velocityCorrection(vector& U) const;
-
 
 protected: