From ef294070cd908caa378e48544175621fdfd1820e Mon Sep 17 00:00:00 2001
From: Thomas Lichtenegger <thomas.lichtenegger@jku.at>
Date: Tue, 27 Apr 2021 10:08:40 +0200
Subject: [PATCH] Commented out references to recurrence base in
 terminalVelocity model.

---
 src/lagrangian/cfdemParticle/Make/options     |  2 --
 .../terminalVelocity/terminalVelocity.C       | 20 +++++++++----------
 .../terminalVelocity/terminalVelocity.H       | 10 +++++-----
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/Make/options b/src/lagrangian/cfdemParticle/Make/options
index ef32d460..f8a3be9b 100644
--- a/src/lagrangian/cfdemParticle/Make/options
+++ b/src/lagrangian/cfdemParticle/Make/options
@@ -21,7 +21,6 @@ EXE_INC = \
     -I$(CFDEM_LIGGGHTS_SRC_DIR) \
     -I$(CFDEM_M2MLIB_PATH) \
     -I$(CFDEM_SRC_DIR)/cfdTools \
-    -I$(CFDEM_SRC_DIR)/recurrence/lnInclude \
     -Wno-old-style-cast \
     -Wno-unused-result \
     -Wno-literal-suffix
@@ -34,7 +33,6 @@ LIB_LIBS = \
     -lincompressibleTurbulenceModels \
     -lmeshTools \
     -llagrangian \
-    -lrecurrence \
     -lmpi_cxx \
     -Wl,-rpath,$(CFDEM_LIGGGHTS_BIN_DIR) \
     -L$(CFDEM_LIGGGHTS_BIN_DIR) \
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.C b/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.C
index 4929f066..bc92001d 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.C
@@ -1,6 +1,6 @@
 /*---------------------------------------------------------------------------*\
     CFDEMcoupling academic - Open Source CFD-DEM coupling
-    
+
     Contributing authors:
     Thomas Lichtenegger, Sanaz Abbasi
     Copyright (C) 2015- Johannes Kepler University, Linz
@@ -65,8 +65,8 @@ terminalVelocity::terminalVelocity
     turbDissipationRateFieldName_(propsDict_.lookupOrDefault<word>("turbDissipationRateFieldName","")),
     turbKineticEnergy_(NULL),
     turbDissipationRate_(NULL),
-    recurrenceBaseName_(propsDict_.lookupOrDefault<word>("recurrenceBaseName","")),
-    recurrenceBase_(NULL),
+//    recurrenceBaseName_(propsDict_.lookupOrDefault<word>("recurrenceBaseName","")),
+//    recurrenceBase_(NULL),
     existturbDissipationRateInObjReg_(false),
     delta(  IOobject
                 (
@@ -98,11 +98,12 @@ terminalVelocity::terminalVelocity
     if(ignoreCellsName_ != "none")
     {
        ignoreCells_.set(new cellSet(particleCloud_.mesh(),ignoreCellsName_));
-       Info << "isotropicFluctuations: ignoring rising velocity in cellSet " << ignoreCells_().name() <<
+       Info << "terminalVelocity: ignoring rising velocity in cellSet " << ignoreCells_().name() <<
         " with " << ignoreCells_().size() << " cells." << endl;
     }
     else existIgnoreCells_ = false;
 
+/*
     if (recurrenceBaseName_ != "")
     {
         Info << "creating the recBase pointer" << endl;
@@ -110,7 +111,7 @@ terminalVelocity::terminalVelocity
         recurrenceBase_ = &rBase_;
         existturbDissipationRateInObjReg_ = true;
     }
-
+*/
        turbDissipationRate_ = new volScalarField
         (
             IOobject
@@ -156,7 +157,7 @@ terminalVelocity::terminalVelocity
                 wallIndicatorField_[cellI] = 1.0;
             }
         }
-  
+
 }
 
 
@@ -266,7 +267,6 @@ void terminalVelocity::setForce() const
                 Pout << "rising velocity = " << Urising << endl;
             }
     }
-   
 }
 
 void terminalVelocity::updateEpsilon() const
@@ -276,7 +276,7 @@ void terminalVelocity::updateEpsilon() const
         Info << "epsilon is calculated from the turbulence model. " << endl;
         *turbDissipationRate_ = particleCloud_.turbulence().epsilon()();
     }
-
+/*
     else if (recurrenceBaseName_ != "")
     {
          Info << "updating epsilon from the database. " << endl;
@@ -294,11 +294,11 @@ void terminalVelocity::updateEpsilon() const
              *turbDissipationRate_ = 1.048*Foam::pow(*turbKineticEnergy_,1.5)/delta;
          }
      }
-     else
+    else
     {
         FatalError <<"turbulent dissipation enery must be calculated either from the turbulence model or recurrence dataBase!\n" << abort(FatalError);
     }
-
+*/
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.H b/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.H
index 824c0090..316497ab 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.H
@@ -28,8 +28,8 @@ License
 #include "forceModel.H"
 #include "interpolationCellPoint.H"
 #include "cellSet.H"
-#include "recBase.H"
-#include "recModel.H"
+//#include "recBase.H"
+//#include "recModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ class terminalVelocity
 {
 private:
     dictionary propsDict_;
-    
+
     bool interpolate_;
 
     const fvMesh& mesh_;
@@ -62,7 +62,7 @@ private:
 
     word turbKineticEnergyFieldName_;
 
-    word recurrenceBaseName_;
+//    word recurrenceBaseName_;
 
     volScalarField* turbKineticEnergy_;
 
@@ -88,7 +88,7 @@ private:
 
     void updateEpsilon() const;
 
-    recBase* recurrenceBase_;
+//    recBase* recurrenceBase_;
 
 public: