From dc8ca8b5206be5f561f61706ae2cfce2a72022e7 Mon Sep 17 00:00:00 2001
From: danielque <daniel.queteschiner@jku.at>
Date: Thu, 11 May 2017 19:10:12 +0200
Subject: [PATCH] pass label by value instead of reference

index does not get modified; also avoid potential problems in case int
needs to be cast to a label of different size;
---
 .../forceModel/forceSubModels/ScaleForce/ScaleForce.C       | 2 +-
 .../forceModel/forceSubModels/ScaleForce/ScaleForce.H       | 4 ++--
 .../forceModel/forceSubModels/forceSubModel/forceSubModel.C | 2 +-
 .../forceModel/forceSubModels/forceSubModel/forceSubModel.H | 2 +-
 .../forceSubModels/scaleForceBoundary/scaleForceBoundary.C  | 2 +-
 .../forceSubModels/scaleForceBoundary/scaleForceBoundary.H  | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.C b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.C
index 942d3a59..89527e65 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.C
@@ -62,7 +62,7 @@ ScaleForce::~ScaleForce()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 void ScaleForce::partToArray
 (
-    label& index,
+    label index,
     vector& dragTot,
     const vector& dragEx,
     const vector& Ufluid,
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.H b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.H
index cd44fee5..95f8a455 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.H
@@ -70,8 +70,8 @@ public:
 
 
     // Member Functions
-	
-	void partToArray(label&, vector&, const vector&, const vector& Ufluid=vector::zero, scalar Cd=scalar(0)) const;
+
+        void partToArray(label, vector&, const vector&, const vector& Ufluid=vector::zero, scalar Cd=scalar(0)) const;
 
         word myType() const{return typeName; };
 };
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.C b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.C
index ba235213..1db018c6 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.C
@@ -131,7 +131,7 @@ forceSubModel::~forceSubModel()
 // * * * * * * * * * * * * * * * * Member Fct  * * * * * * * * * * * * * * * //
 void forceSubModel::partToArray
 (
-    label& index,
+    label index,
     vector& dragTot,
     const vector& dragEx,
     const vector& Ufluid,
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H
index f64173bf..4e0a3d3a 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H
@@ -130,7 +130,7 @@ public:
 
 
     // Member Functions
-        virtual void partToArray(label&, vector&, const vector&, const vector& Ufluid=vector::zero, scalar Cd=scalar(0)) const;
+        virtual void partToArray(label, vector&, const vector&, const vector& Ufluid=vector::zero, scalar Cd=scalar(0)) const;
 
         virtual void explicitCorr(vector&, vector&, scalar&, vector&, const vector&, vector&, const vector&, bool,label index=100) const;
 
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.C b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.C
index 0270881b..48ba4c4b 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.C
@@ -97,7 +97,7 @@ scaleForceBoundary::~scaleForceBoundary()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 void scaleForceBoundary::partToArray
 (
-    label& index,
+    label index,
     vector& dragTot,
     const vector& dragEx,
     const vector& Ufluid,
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.H b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.H
index 807c860f..d12ef476 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.H
@@ -82,10 +82,10 @@ public:
 
 
     // Member Functions
-	
-	void partToArray(label&, vector&, const vector&, const vector& Ufluid=vector::zero, scalar Cd=scalar(0)) const;
 
-        word myType() const{return typeName; };
+        void partToArray(label, vector&, const vector&, const vector& Ufluid=vector::zero, scalar Cd=scalar(0)) const;
+
+        word myType() const {return typeName; }
 };