From d75befae08f7f7dc9da6e725afaea69e2a04849a Mon Sep 17 00:00:00 2001
From: Thomas Lichtenegger <thomas.lichtenegger@jku.at>
Date: Tue, 27 Apr 2021 10:07:36 +0200
Subject: [PATCH] Option to deactivate model check.

---
 .../cfdemParticle/cfdTools/checkModelType.H         | 13 ++++++++++---
 .../cfdemParticle/cfdemCloud/cfdemCloud.C           |  1 +
 .../cfdemParticle/cfdemCloud/cfdemCloud.H           |  4 ++++
 .../cfdemParticle/cfdemCloud/cfdemCloudI.H          |  5 +++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/cfdTools/checkModelType.H b/src/lagrangian/cfdemParticle/cfdTools/checkModelType.H
index a758d183..030734cf 100644
--- a/src/lagrangian/cfdemParticle/cfdTools/checkModelType.H
+++ b/src/lagrangian/cfdemParticle/cfdTools/checkModelType.H
@@ -1,8 +1,10 @@
+// check model type
+// referring to: Zhou et al. 2010,JFM
 
-    // check model type
-    // referring to: Zhou et al. 2010,JFM
-    word modelType = particleCloud.modelType();
+word modelType = particleCloud.modelType();
 
+if (particleCloud.modelCheck())
+{
     //Warning << "model type not being checked" << endl;
     if (modelType=="Bfull"){
         Info << "solving volume averaged Navier Stokes equations of type B\n"<< endl;
@@ -102,3 +104,8 @@
 
     if (particleCloud.smoothingM().type() == "temporalSmoothing")
         FatalError << "the temporalSmoothing model does not support smoothing of the exchange fields, please see documentation!" << endl;
+}
+else
+{
+    Warning << "Model check deactivated." << endl;
+}
diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
index 734d3118..06c9583a 100644
--- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
+++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
@@ -83,6 +83,7 @@ cfdemCloud::cfdemCloud
     verbose_(couplingProperties_.found("verbose")),
     ignore_(couplingProperties_.found("ignore")),
     allowCFDsubTimestep_(true),
+    modelCheck_(couplingProperties_.lookupOrDefault<bool>("modelCheck",true)),
     limitDEMForces_(couplingProperties_.found("limitDEMForces")),
     phaseInForces_(couplingProperties_.found("phaseInForcesTime")),
     getParticleDensities_(couplingProperties_.lookupOrDefault<bool>("getParticleDensities",false)),
diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
index fe8babfd..f3d4fd61 100644
--- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
+++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
@@ -95,6 +95,8 @@ protected:
 
     bool allowCFDsubTimestep_;
 
+    const bool modelCheck_;
+
     const bool limitDEMForces_;
 
     const bool phaseInForces_;
@@ -309,6 +311,8 @@ public:
 
        inline bool ignore() const;
 
+       inline bool modelCheck() const;
+
        inline const fvMesh& mesh() const;
 
        inline bool solveFlow() const;
diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H
index dc3a4125..32539fa4 100644
--- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H
+++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H
@@ -99,6 +99,11 @@ inline bool cfdemCloud::ignore() const
     return ignore_;
 }
 
+inline bool cfdemCloud::modelCheck() const
+{
+    return modelCheck_;
+}
+
 inline const fvMesh& cfdemCloud::mesh() const
 {
     return mesh_;