From 96508745fba1623d6dccb36f9b4e3ce95d72116d Mon Sep 17 00:00:00 2001
From: Daniel Queteschiner <daniel.queteschiner@jku.at>
Date: Tue, 9 Apr 2019 15:49:36 +0200
Subject: [PATCH] move methods from dataExchangeModel to cfdemCloud

methods operate directly on data owned by cfdemCloud, thus
cfdemCloud should have the control over it
---
 .../cfdemParticle/cfdemCloud/cfdemCloud.H     |  4 ++++
 .../cfdemParticle/cfdemCloud/cfdemCloudI.H    | 19 +++++++++++++++++
 .../dataExchangeModel/dataExchangeModel.H     | 21 -------------------
 .../twoWayMany2Many/twoWayMany2Many.C         |  4 ++--
 .../twoWayOne2One/twoWayOne2One.C             |  4 ++--
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
index 5d96f0ad..4ec5eb87 100644
--- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
+++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
@@ -403,6 +403,10 @@ public:
     // Write
 
       // write cfdemCloud internal data
+        inline void setPositions(label n,double* pos);
+        inline void setCellIDs(label n,int* ID);
+        inline void setCellIDs(labelList const& IDs);
+
         virtual bool evolve(volScalarField&,volVectorField&,volVectorField&);
 
         virtual void postFlow() {}
diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H
index 504c1682..b810e094 100644
--- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H
+++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H
@@ -50,6 +50,25 @@ inline void cfdemCloud::setCG(double cg)
     Info << "cg is set to: " << cg_ << endl;
 }
 
+inline void cfdemCloud::setPositions(label n,double* pos)
+{
+    for (int i=0; i<n; ++i)
+        for (int j=0; j<3; ++j)
+            positions_[i][j]=pos[i*3+j];
+}
+
+inline void cfdemCloud::setCellIDs(label n,int* ID)
+{
+    for (int i=0; i<n; ++i)
+        cellIDs_[i][0]=ID[i];
+}
+
+inline void cfdemCloud::setCellIDs(labelList const& IDs)
+{
+    for (int i=0; i<IDs.size(); ++i)
+        cellIDs_[i][0] = IDs[i];
+}
+
 inline bool cfdemCloud::impDEMdrag() const
 {
     return impDEMdrag_;
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
index 2c6caaf2..f2e3407f 100755
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
@@ -244,27 +244,6 @@ public:
         virtual int getNumberOfTypes() const;
         virtual double* getTypeVol() const;
 
-        inline void setPositions(label n,double* pos)
-        {
-            for (int i=0;i<n;i++)
-                for (int j=0;j<3;j++)
-                    particleCloud_.positions_[i][j]=pos[i*3+j];
-        }
-
-        inline void setCellIDs(label n,int* ID)
-        {
-            for (int i=0;i<n;i++)
-                particleCloud_.cellIDs_[i][0]=ID[i];
-        }
-        inline void setCellIDs(labelList const& ids)
-        {
-            for (int i = 0; i < ids.size(); i++)
-            {
-                particleCloud_.cellIDs_[i][0] = ids[i];
-            }
-        }
-
-
         virtual scalar getCG() const { Warning << "getCG() not executed correctly!" << endl; return 1.; }
 };
 
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.C
index 456cf7db..79d50ed5 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.C
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.C
@@ -435,8 +435,8 @@ bool twoWayMany2Many::couple(int i)
         // re-allocate arrays of cloud
         particleCloud_.reAllocArrays();
 
-        setPositions(nlocal_foam_,pos_foam_);
-        setCellIDs(nlocal_foam_,cellID_foam_);
+        particleCloud_.setPositions(nlocal_foam_,pos_foam_);
+        particleCloud_.setCellIDs(nlocal_foam_,cellID_foam_);
 
         Info <<"Foam::twoWayMany2Many::couple(i) done." << endl;
     }
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
index c905f7cd..84398f79 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
@@ -816,11 +816,11 @@ void twoWayOne2One::locateParticles()
         extracted_flattened_positions,
         3
     );
-    setPositions(getNumberOfParticles(), extracted_flattened_positions);
+    particleCloud_.setPositions(getNumberOfParticles(), extracted_flattened_positions);
     destroy(extracted_flattened_positions);
     destroy(collected_flattened_positions);
 
-    setCellIDs(cellIds);
+    particleCloud_.setCellIDs(cellIds);
 }
 
 void twoWayOne2One::setupFoam2LigCommunication()