From b64dfacc33e793146a00b881c7b4caa4c38810b1 Mon Sep 17 00:00:00 2001
From: Paul Kieckhefen <paul.kieckhefen@tuhh.de>
Date: Thu, 16 May 2019 10:15:23 +0200
Subject: [PATCH 1/2] fix problem introduced with
 e9a7a0f15a484a85e8af6d68b57a540134b5174a that causes drag to be severely
 underestimated when a cg factor directly from liggghts is used.

---
 .../subModels/forceModel/BeetstraDrag/BeetstraDrag.C             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C
index 59c39254..18381aa3 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C
@@ -148,6 +148,7 @@ void BeetstraDrag::setForce() const
     else if (particleCloud_.cg() > 1)
     {
         scaleDia_=particleCloud_.cg();
+        typeCG_[0] = scaleDia_;
         Info << "Beetstra using scale from liggghts cg = " << scaleDia_ << endl;
     }
 

From 29b7ae5ff9d88e00ed64a7f13378ae260259e55d Mon Sep 17 00:00:00 2001
From: Paul Kieckhefen <paul.kieckhefen@tuhh.de>
Date: Thu, 16 May 2019 11:09:03 +0200
Subject: [PATCH 2/2] make typeCG mutable (b/c setForce is const).

---
 .../subModels/forceModel/BeetstraDrag/BeetstraDrag.H            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.H b/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.H
index c2128855..bc2b1c03 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.H
@@ -61,7 +61,7 @@ protected:
 
     mutable scalar scaleDia_;
 
-    scalarList typeCG_;
+    mutable scalarList typeCG_;
 
     mutable scalar scaleDrag_;