From f847ceeefed40dd6cf85a38dbce3ddae9a3ab67f Mon Sep 17 00:00:00 2001
From: danielque <daniel.queteschiner@jku.at>
Date: Mon, 28 Jun 2021 16:47:05 +0200
Subject: [PATCH] replace custom myType() method by built-in type() method

---
 .../subModels/forceModel/forceSubModels/ImEx/ImEx.H           | 4 ----
 .../forceModel/forceSubModels/ScaleForce/ScaleForce.H         | 1 -
 .../forceModel/forceSubModels/forceSubModel/forceSubModel.C   | 2 +-
 .../forceModel/forceSubModels/forceSubModel/forceSubModel.H   | 2 --
 .../forceSubModels/scaleForceBoundary/scaleForceBoundary.H    | 1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ImEx/ImEx.H b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ImEx/ImEx.H
index 7d017b99..188034b3 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ImEx/ImEx.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ImEx/ImEx.H
@@ -77,10 +77,6 @@ public:
 
         ~ImEx();
 
-
-    // Member Functions
-
-        word myType() const{return typeName; };
 };
 
 
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.H b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.H
index 47715b85..204aa35b 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.H
@@ -73,7 +73,6 @@ public:
 
         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 590f8139..de9b5ece 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.C
@@ -192,7 +192,7 @@ void forceSubModel::explicitCorr
 
 void forceSubModel::readSwitches()
 {
-    Info << "\nreading switches for forceSubModel:" << myType() << endl;
+    Info << "\nreading switches for forceSubModel:" << type() << endl;
     forAll(switchesNameList_,i)
     {
         if(switchesList_[i]) //check if switch is required
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H
index 407ecce8..f9688c55 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H
@@ -158,8 +158,6 @@ public:
 
         inline bool useParcelSizeDependentFilteredDrag() const { return switches_[SW_PARCEL_SIZE_DEPENDENT_FILTERED_DRAG]; }
 
-        virtual word myType() const = 0;
-
         inline forceModel& myForceM() const { return forceModel_; }
 
         inline const List<Switch>& switches() const { return switches_; }
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.H b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.H
index 8a4f65cd..23fa08bf 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.H
@@ -85,7 +85,6 @@ public:
 
         void partToArray(label, vector&, const vector&, const vector& Ufluid=vector::zero, scalar Cd=scalar(0)) const;
 
-        word myType() const {return typeName; }
 };