zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace custom myType() method by built-in type() method

Browse Source
This commit is contained in:
danielque
2021-06-28 16:47:05 +02:00
parent 1a8a299470
commit f847ceeefe
5 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ImEx/ImEx.H
View File

@ -77,10 +77,6 @@ public:
~ImEx();
// Member Functions
word myType() const{return typeName; };
};

1
src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.H
View File

@ -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; };
};

2
src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.C
View File

@ -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

2
src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H
View File

@ -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_; }

1
src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.H
View File

@ -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; }
};