From 3ad0fa0ac70cd7469ea4bf0120220baf161c0c90 Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 1 Oct 2018 15:30:43 +0200 Subject: [PATCH 01/11] make parameters of IOModel methods const parameters do not get changed in any of these methods --- .../subModels/IOModel/IOModel/IOModel.C | 12 ++++++------ .../subModels/IOModel/IOModel/IOModel.H | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C b/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C index a6b62e6c..cf424f74 100644 --- a/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C +++ b/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C @@ -59,14 +59,14 @@ bool IOModel::dumpNow() const return time_.outputTime(); } -fileName IOModel::createTimeDir(fileName path) const +fileName IOModel::createTimeDir(const fileName& path) const { fileName timeDirPath(path/time_.timeName()); mkDir(timeDirPath,0777); return timeDirPath; } -fileName IOModel::createLagrangianDir(fileName path) const +fileName IOModel::createLagrangianDir(const fileName& path) const { fileName lagrangianDirPath(path/"lagrangian"); mkDir(lagrangianDirPath,0777); @@ -75,7 +75,7 @@ fileName IOModel::createLagrangianDir(fileName path) const return cfdemCloudDirPath; } -fileName IOModel::buildFilePath(word dirName) const +fileName IOModel::buildFilePath(const word& dirName) const { // create file structure fileName path(""); @@ -94,7 +94,7 @@ fileName IOModel::buildFilePath(word dirName) const return path; } -void IOModel::streamDataToPath(fileName path, double** array,int nPProc,word name,word type,word className) const +void IOModel::streamDataToPath(const fileName& path, const double* const* array,int nPProc,const word& name,const word& type,const word& className) const { OFstream fileStream(path/name); @@ -107,7 +107,7 @@ void IOModel::streamDataToPath(fileName path, double** array,int nPProc,word nam << " object " << name << ";\n" << "}" << nl; - fileStream << nPProc <<"\n"; + fileStream << nPProc << "\n"; if (type == "origProcId") { @@ -118,7 +118,7 @@ void IOModel::streamDataToPath(fileName path, double** array,int nPProc,word nam fileStream << token::BEGIN_LIST << nl; - int ** cellIDs = particleCloud_.cellIDs(); + const int * const* cellIDs = particleCloud_.cellIDs(); for (int index = 0; index < particleCloud_.numberOfParticles(); ++index) { if (cellIDs[index][0] > -1) // particle Found diff --git a/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.H b/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.H index f0329302..4785882b 100644 --- a/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.H +++ b/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.H @@ -115,13 +115,13 @@ public: bool dumpNow() const; - fileName createTimeDir(fileName) const; + fileName createTimeDir(const fileName&) const; - fileName createLagrangianDir(fileName) const; + fileName createLagrangianDir(const fileName&) const; - fileName buildFilePath(word) const; + fileName buildFilePath(const word&) const; - void streamDataToPath(fileName,double**,int,word,word type,word className) const; + void streamDataToPath(const fileName&,const double* const*,int,const word&,const word& type,const word& className) const; }; From 2c028ed37b7e5f9251c3390bca8d333b94a701b1 Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 1 Oct 2018 15:31:13 +0200 Subject: [PATCH 02/11] remove unneeded conversion to bool --- src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H index 5c7b6e70..41a5bc9d 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H @@ -87,7 +87,7 @@ inline const fvMesh& cfdemCloud::mesh() const inline bool cfdemCloud::solveFlow() const { - return bool(solveFlow_); + return solveFlow_; } inline bool cfdemCloud::verbose() const From e25a25f29440eb5bdac2c7bf65fe26774e6c420a Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 1 Oct 2018 15:33:32 +0200 Subject: [PATCH 03/11] remove unneeded mutable keywords in cfdemCloud --- .../cfdemParticle/cfdemCloud/cfdemCloud.H | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H index 562a984e..f1d4845b 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H @@ -106,39 +106,39 @@ protected: const word modelType_; - mutable double **positions_; + double **positions_; - mutable double **velocities_; + double **velocities_; - mutable double **fluidVel_; + double **fluidVel_; - mutable double **fAcc_; + double **fAcc_; - mutable double **impForces_; + double **impForces_; - mutable double **expForces_; + double **expForces_; - mutable double **DEMForces_; + double **DEMForces_; - mutable double **Cds_; + double **Cds_; - mutable double **radii_; + double **radii_; - mutable double **voidfractions_; + double **voidfractions_; - mutable int **cellIDs_; + int **cellIDs_; - mutable double **particleDensities_; + double **particleDensities_; - mutable double **particleEffVolFactors_; + double **particleEffVolFactors_; - mutable int **particleTypes_; + int **particleTypes_; - mutable double **particleWeights_; + double **particleWeights_; - mutable double **particleVolumes_; + double **particleVolumes_; - mutable double **particleV_; + double **particleV_; int numberOfParticles_; @@ -146,7 +146,7 @@ protected: bool numberOfParticlesChanged_; - mutable bool arraysReallocated_; + bool arraysReallocated_; const wordList forceModels_; @@ -158,7 +158,7 @@ protected: const word turbulenceModelType_; - mutable scalar cg_; + scalar cg_; bool cgOK_; @@ -176,7 +176,7 @@ protected: mutable volScalarField particleDensityField_; - mutable Switch checkPeriodicCells_; + Switch checkPeriodicCells_; const turbulenceModel& turbulence_; From be2a4ad87b7203945e9f27238b045728b9c6e24f Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 1 Oct 2018 15:34:21 +0200 Subject: [PATCH 04/11] make some getter methods in cfdemCloud const --- src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H index f1d4845b..95352f67 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H @@ -244,7 +244,7 @@ public: // public Member Functions // Access - bool allowCFDsubTimestep() { return allowCFDsubTimestep_; } + bool allowCFDsubTimestep() const { return allowCFDsubTimestep_; } void setAllowCFDsubTimestep(bool b) { allowCFDsubTimestep_ = b; } @@ -428,7 +428,7 @@ public: void otherForces(volVectorField&); - bool checkPeriodicCells() { return checkPeriodicCells_; } + bool checkPeriodicCells() const { return checkPeriodicCells_; } }; From 304b7328c4064d2e7755d32cefaac3597f0acc7f Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 1 Oct 2018 16:01:50 +0200 Subject: [PATCH 05/11] fix up some more mutable stuff in cfdemCloud and cfdemCloudIB --- src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C | 2 +- src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H | 10 +++++----- src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H | 2 +- .../cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.H | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C index 0dcb03e5..f586d6cb 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C @@ -781,7 +781,7 @@ tmp cfdemCloud::ddtVoidfraction() const return tmp (ddtVoidfraction_ * 1.) ; } -void cfdemCloud::calcDdtVoidfraction(volScalarField& voidfraction) const +void cfdemCloud::calcDdtVoidfraction(volScalarField& voidfraction) { // version if ddt is calculated only at coupling time //Info << "calculating ddt(voidfraction) based on couplingTime" << endl; diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H index 95352f67..201ebad7 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H @@ -172,9 +172,9 @@ protected: const bool useDDTvoidfraction_; - mutable volScalarField ddtVoidfraction_; + volScalarField ddtVoidfraction_; - mutable volScalarField particleDensityField_; + volScalarField particleDensityField_; Switch checkPeriodicCells_; @@ -202,7 +202,7 @@ protected: autoPtr meshMotionModel_; - mutable PtrList liggghtsCommand_; + PtrList liggghtsCommand_; PtrList otherForceModel_; @@ -395,7 +395,7 @@ public: inline const wordList& liggghtsCommandModelList() const; - inline liggghtsCommandModel& liggghtsCommand(const label) const; + inline liggghtsCommandModel& liggghtsCommand(const label); inline const turbulenceModel& turbulence() const; @@ -418,7 +418,7 @@ public: tmp ddtVoidfraction() const; - void calcDdtVoidfraction(volScalarField& voidfraction) const; + void calcDdtVoidfraction(volScalarField& voidfraction); //tmp ddtVoidfractionU(volVectorField& ,volScalarField&) const; diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H index 41a5bc9d..edae0845 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H @@ -349,7 +349,7 @@ inline const wordList& cfdemCloud::liggghtsCommandModelList() const return liggghtsCommandModelList_; } -inline liggghtsCommandModel& cfdemCloud::liggghtsCommand(const label modeli) const +inline liggghtsCommandModel& cfdemCloud::liggghtsCommand(const label modeli) { return liggghtsCommand_[modeli]; } diff --git a/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.H b/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.H index d1db244d..88041fc8 100644 --- a/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.H +++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.H @@ -58,12 +58,12 @@ class cfdemCloudIB { protected: - mutable double **angularVelocities_; + double **angularVelocities_; label pRefCell_; scalar pRefValue_; - mutable bool haveEvolvedOnce_; - mutable bool skipLagrangeToEulerMapping_; + bool haveEvolvedOnce_; + bool skipLagrangeToEulerMapping_; public: From f7716a67a60ef73f262f1097893e57d15d22be81 Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 1 Oct 2018 16:03:06 +0200 Subject: [PATCH 06/11] make some getter methods of liggghtsCommandModel const --- .../subModels/liggghtsCommandModel/execute/execute.H | 2 +- .../liggghtsCommandModel/liggghtsCommandModel.H | 10 +++++----- .../readLiggghtsData/readLiggghtsData.H | 2 +- .../liggghtsCommandModel/runLiggghts/runLiggghts.H | 2 +- .../liggghtsCommandModel/writeLiggghts/writeLiggghts.H | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.H b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.H index 00b7f90c..1d9df4ae 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.H +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.H @@ -94,7 +94,7 @@ public: // Member Functions - word name(){return propsDict_.dictName();}; + word name() const {return propsDict_.dictName();} const char* command(int); diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/liggghtsCommandModel/liggghtsCommandModel.H b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/liggghtsCommandModel/liggghtsCommandModel.H index b8ba17dd..ad31344d 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/liggghtsCommandModel/liggghtsCommandModel.H +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/liggghtsCommandModel/liggghtsCommandModel.H @@ -165,15 +165,15 @@ public: // Access - int nextRun(){return nextRun_;} + int nextRun() const {return nextRun_;} - int lastRun(){return lastRun_;} + int lastRun() const {return lastRun_;} - virtual word name()=0; + virtual word name() const=0; - bool exactTiming(){return exactTiming_;} + bool exactTiming() const {return exactTiming_;} - label commandLines(){return commandLines_;} + label commandLines() const {return commandLines_;} void parseCommandList(wordList&, labelList&, scalarList&, word&, dictionary&, bool&); }; diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.H b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.H index 38013710..c52fc893 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.H +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.H @@ -89,7 +89,7 @@ public: // Member Functions - word name(){return propsDict_.dictName();}; + word name() const {return propsDict_.dictName();} const char* command(int); diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/runLiggghts/runLiggghts.H b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/runLiggghts/runLiggghts.H index aa76f2ca..6068730d 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/runLiggghts/runLiggghts.H +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/runLiggghts/runLiggghts.H @@ -92,7 +92,7 @@ public: bool runCommand(int); - word name(){return "runLiggghts";}; + word name() const {return "runLiggghts";} void set(int); }; diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.H b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.H index 18b26519..c7b59a40 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.H +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.H @@ -97,7 +97,7 @@ public: bool runCommand(int); - word name(){return "writeLiggghts";}; + word name() const {return "writeLiggghts";} }; From 583e1ff3bb7deb69ce26223ede29c4ed3081973e Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 1 Oct 2018 16:49:07 +0200 Subject: [PATCH 07/11] surviving without mutable use proper function signatures provide getters for (const and) non-const references --- .../cfdemParticle/cfdemCloud/cfdemCloud.H | 1 + .../cfdemParticle/cfdemCloud/cfdemCloudI.H | 6 ++++- .../averagingModel/averagingModel.C | 4 ++-- .../averagingModel/averagingModel.H | 24 ++++++++++--------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H index 201ebad7..88bc69d5 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H @@ -385,6 +385,7 @@ public: inline probeModel& probeM(); + inline averagingModel& averagingM(); inline const averagingModel& averagingM() const; inline const clockModel& clockM() const; diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H index edae0845..d32a89e5 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H @@ -322,11 +322,15 @@ inline probeModel& cfdemCloud::probeM() inline const voidFractionModel& cfdemCloud::voidFractionM() const { return voidFractionModel_; + +inline averagingModel& cfdemCloud::averagingM() +{ + return averagingModel_(); } inline const averagingModel& cfdemCloud::averagingM() const { - return averagingModel_; + return averagingModel_(); } inline const clockModel& cfdemCloud::clockM() const diff --git a/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.C b/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.C index 5a0614f3..b6526912 100644 --- a/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.C +++ b/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.C @@ -332,13 +332,13 @@ void averagingModel::resetVectorAverage(volVectorField& prev,volVectorField& nex next.primitiveFieldRef() = vector::zero; } -void averagingModel::resetWeightFields() const +void averagingModel::resetWeightFields() { UsWeightField_.ref() = 0; } -void averagingModel::undoWeightFields(double**const& mask) const +void averagingModel::undoWeightFields(double**const& mask) { for(int index=0; index< particleCloud_.numberOfParticles(); index++) { diff --git a/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.H b/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.H index 93b334eb..cbe071d7 100644 --- a/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.H +++ b/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.H @@ -61,11 +61,11 @@ protected: cfdemCloud& particleCloud_; - mutable volScalarField UsWeightField_; + volScalarField UsWeightField_; - mutable volVectorField UsPrev_; + volVectorField UsPrev_; - mutable volVectorField UsNext_; + volVectorField UsNext_; // Protected member functions @@ -194,23 +194,25 @@ public: void resetVectorAverage(volVectorField& prev,volVectorField& next,bool single=false) const; - void resetWeightFields() const; + void resetWeightFields(); - void undoWeightFields(double**const&) const; + void undoWeightFields(double**const&); tmp UsInterp() const; - virtual void setParticleType(label type) const {}; + virtual void setParticleType(label type) const {} - virtual bool checkParticleType(label) const {return true;}; //consider all particles by default + virtual bool checkParticleType(label) const {return true;} //consider all particles by default // Access - inline volVectorField& UsPrev() const {return UsPrev_;}; + inline volVectorField& UsPrev() {return UsPrev_;} + inline const volVectorField& UsPrev() const {return UsPrev_;} - inline volVectorField& UsNext() const {return UsNext_;}; - - inline volScalarField& UsWeightField() const {return UsWeightField_;}; + inline volVectorField& UsNext() {return UsNext_;} + inline const volVectorField& UsNext() const {return UsNext_;} + inline volScalarField& UsWeightField() {return UsWeightField_;} + inline const volScalarField& UsWeightField() const {return UsWeightField_;} }; From 2c46466a066aa2ca9780da6ab910e7145717c4a2 Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 1 Oct 2018 17:56:04 +0200 Subject: [PATCH 08/11] remove mutables from voidFractionModel classes --- .../cfdemParticle/cfdemCloud/cfdemCloud.H | 1 + .../cfdemParticle/cfdemCloud/cfdemCloudI.H | 8 ++++- .../GaussVoidFraction/GaussVoidFraction.C | 2 +- .../GaussVoidFraction/GaussVoidFraction.H | 4 +-- .../IBVoidFraction/IBVoidFraction.C | 4 +-- .../IBVoidFraction/IBVoidFraction.H | 6 ++-- .../bigParticleVoidFraction.C | 2 +- .../bigParticleVoidFraction.H | 4 +-- .../centreVoidFraction/centreVoidFraction.C | 2 +- .../centreVoidFraction/centreVoidFraction.H | 4 +-- .../dividedVoidFraction/dividedVoidFraction.C | 2 +- .../dividedVoidFraction/dividedVoidFraction.H | 6 ++-- .../trilinearVoidFraction.C | 2 +- .../trilinearVoidFraction.H | 2 +- .../voidFractionModel/voidFractionModel.C | 6 ++-- .../voidFractionModel/voidFractionModel.H | 32 ++++++++++--------- 16 files changed, 48 insertions(+), 39 deletions(-) diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H index 88bc69d5..2912d960 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H @@ -373,6 +373,7 @@ public: inline const wordList& forceModels() const; + inline voidFractionModel& voidFractionM(); inline const voidFractionModel& voidFractionM() const; inline const locateModel& locateM() const; diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H index d32a89e5..2ab8d0fe 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H @@ -319,9 +319,15 @@ inline probeModel& cfdemCloud::probeM() return probeModel_(); } +inline voidFractionModel& cfdemCloud::voidFractionM() +{ + return voidFractionModel_(); +} + inline const voidFractionModel& cfdemCloud::voidFractionM() const { - return voidFractionModel_; + return voidFractionModel_(); +} inline averagingModel& cfdemCloud::averagingM() { diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.C index 595f17c2..9a8c5a22 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.C @@ -87,7 +87,7 @@ GaussVoidFraction::~GaussVoidFraction() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void GaussVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) const +void GaussVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) { reAllocArrays(); diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.H b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.H index 535166ba..0a84508d 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.H +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.H @@ -63,7 +63,7 @@ private: const scalar alphaMin_; //NP min value of voidFraction - mutable bool alphaLimited_; + bool alphaLimited_; public: @@ -86,7 +86,7 @@ public: // Member Functions - void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const; + void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&); void buildLabelHashSet ( diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C index eeb7ad2e..fcc1947b 100755 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C @@ -87,7 +87,7 @@ IBVoidFraction::~IBVoidFraction() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void IBVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) const +void IBVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) { const boundBox& globalBb = particleCloud_.mesh().bounds(); @@ -306,7 +306,7 @@ void IBVoidFraction::buildLabelHashSet const label cellID, labelHashSet& hashSett, bool initialInsert //initial insertion of own cell -)const +) { if(initialInsert) hashSett.insert(cellID); diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.H b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.H index 0e430dc9..7f43e3f8 100755 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.H +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.H @@ -64,7 +64,7 @@ private: const scalar alphaMin_; //NP min value of voidFraction - mutable bool alphaLimited_; + bool alphaLimited_; const scalar scaleUpVol_; //NP scaling radius, keeping volume of particle @@ -91,7 +91,7 @@ public: // Member Functions - void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const; + void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&); void buildLabelHashSet ( @@ -100,7 +100,7 @@ public: const label cellID, labelHashSet& hashSett, bool initialInsert - ) const; + ); virtual double segmentParticleIntersection(int index, vector positionCenter, vector pointInside, vector pointOutside) const; }; diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/bigParticleVoidFraction/bigParticleVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/bigParticleVoidFraction/bigParticleVoidFraction.C index 1ab0de24..4d254b42 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/bigParticleVoidFraction/bigParticleVoidFraction.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/bigParticleVoidFraction/bigParticleVoidFraction.C @@ -86,7 +86,7 @@ bigParticleVoidFraction::~bigParticleVoidFraction() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void bigParticleVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) const +void bigParticleVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) { reAllocArrays(); diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/bigParticleVoidFraction/bigParticleVoidFraction.H b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/bigParticleVoidFraction/bigParticleVoidFraction.H index 8e470a44..2875efb5 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/bigParticleVoidFraction/bigParticleVoidFraction.H +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/bigParticleVoidFraction/bigParticleVoidFraction.H @@ -60,7 +60,7 @@ private: const scalar alphaMin_; // min value of voidFraction - mutable bool alphaLimited_; + bool alphaLimited_; public: @@ -83,7 +83,7 @@ public: // Member Functions - void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const; + void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&); void buildLabelHashSet ( diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/centreVoidFraction/centreVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/centreVoidFraction/centreVoidFraction.C index 6aa96bce..355211cc 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/centreVoidFraction/centreVoidFraction.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/centreVoidFraction/centreVoidFraction.C @@ -78,7 +78,7 @@ centreVoidFraction::~centreVoidFraction() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void centreVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) const +void centreVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) { reAllocArrays(); diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/centreVoidFraction/centreVoidFraction.H b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/centreVoidFraction/centreVoidFraction.H index 15199923..bf6375ad 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/centreVoidFraction/centreVoidFraction.H +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/centreVoidFraction/centreVoidFraction.H @@ -60,7 +60,7 @@ private: const scalar alphaMin_; //NP min value of voidFraction - mutable bool alphaLimited_; + bool alphaLimited_; public: @@ -83,7 +83,7 @@ public: // Member Functions - void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const; + void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&); }; diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C index 6b3da2c8..979bf064 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C @@ -156,7 +156,7 @@ dividedVoidFraction::~dividedVoidFraction() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void dividedVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes, double**& particleV) const +void dividedVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes, double**& particleV) { if (cfdemUseOnly_) reAllocArrays(particleCloud_.numberOfParticles()); diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.H b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.H index 6cde9f28..de8c5409 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.H +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.H @@ -68,9 +68,9 @@ private: const scalar alphaMin_; // min value of voidFraction - mutable bool alphaLimited_; + bool alphaLimited_; - mutable scalar tooMuch_; // particle volume which is lost due to voidFraction limitation + scalar tooMuch_; // particle volume which is lost due to voidFraction limitation const bool interpolation_; @@ -104,7 +104,7 @@ public: // Member Functions - void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const; + void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&); }; diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/trilinearVoidFraction/trilinearVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/trilinearVoidFraction/trilinearVoidFraction.C index 8413532a..c43e3c9f 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/trilinearVoidFraction/trilinearVoidFraction.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/trilinearVoidFraction/trilinearVoidFraction.C @@ -88,7 +88,7 @@ trilinearVoidFraction::~trilinearVoidFraction() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void trilinearVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) const +void trilinearVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) { reAllocArrays(); diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/trilinearVoidFraction/trilinearVoidFraction.H b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/trilinearVoidFraction/trilinearVoidFraction.H index 08a3bdd7..2a821fbe 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/trilinearVoidFraction/trilinearVoidFraction.H +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/trilinearVoidFraction/trilinearVoidFraction.H @@ -88,7 +88,7 @@ public: // Member Functions - void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const; + void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&); }; diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C index 424b8eef..b2e85c9e 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C @@ -112,7 +112,7 @@ tmp voidFractionModel::voidFractionInterp() const ); } -void voidFractionModel::resetVoidFractions() const +void voidFractionModel::resetVoidFractions() { voidfractionPrev_.ref() = voidfractionNext_.ref(); voidfractionNext_.ref() = 1.; @@ -128,7 +128,7 @@ int voidFractionModel::maxCellsPerParticle() const return maxCellsPerParticle_; } -void voidFractionModel::reAllocArrays() const +void voidFractionModel::reAllocArrays() { if(particleCloud_.numberOfParticlesChanged()) { @@ -137,7 +137,7 @@ void voidFractionModel::reAllocArrays() const } } -void voidFractionModel::reAllocArrays(int nP) const +void voidFractionModel::reAllocArrays(int nP) { if(particleCloud_.numberOfParticlesChanged()) { diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.H b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.H index 9a760b31..0f1a47d3 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.H +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.H @@ -65,17 +65,17 @@ protected: bool multiWeights_; - mutable volScalarField voidfractionPrev_; + volScalarField voidfractionPrev_; - mutable volScalarField voidfractionNext_; + volScalarField voidfractionNext_; - mutable int ** cellsPerParticle_; + int ** cellsPerParticle_; int maxCellsPerParticle_; - mutable scalar weight_; + scalar weight_; - mutable scalar porosity_; + scalar porosity_; // Protected member functions @@ -124,30 +124,32 @@ public: // public member functions - virtual void setvoidFraction(double** const&,double**&,double**&,double**&,double**&) const = 0; + virtual void setvoidFraction(double** const&,double**&,double**&,double**&,double**&) = 0; tmp voidFractionInterp() const; - inline volScalarField& voidFractionPrev()const { return voidfractionPrev_; } + volScalarField& voidFractionPrev() { return voidfractionPrev_; } + const volScalarField& voidFractionPrev() const { return voidfractionPrev_; } - inline volScalarField& voidFractionNext()const { return voidfractionNext_; } + volScalarField& voidFractionNext() { return voidfractionNext_; } + const volScalarField& voidFractionNext() const { return voidfractionNext_; } - inline scalar weight()const { return weight_; } + scalar weight() const { return weight_; } - inline scalar weight(label index) const + scalar weight(label index) const { return particleCloud_.particleEffVolFactor(index); } - inline scalar porosity()const { return porosity_; } + scalar porosity() const { return porosity_; } - inline void checkWeightNporosity(dictionary& propsDict) const + void checkWeightNporosity(dictionary& propsDict) { if (propsDict.found("weight")) weight_ = readScalar(propsDict.lookup("weight")); if (propsDict.found("porosity")) porosity_ = readScalar(propsDict.lookup("porosity")); } - void resetVoidFractions() const; + void resetVoidFractions(); //void undoVoidFractions(double**const&) const; @@ -155,9 +157,9 @@ public: int maxCellsPerParticle() const; - void reAllocArrays() const; + void reAllocArrays(); - void reAllocArrays(int nP) const; //force number of particles during reallocation, for CFD offline-use + void reAllocArrays(int nP); //force number of particles during reallocation, for CFD offline-use virtual void setParticleType(label type) const {} From 7a32a196790069dae46014123f97be7134395ee1 Mon Sep 17 00:00:00 2001 From: danielque Date: Wed, 3 Oct 2018 12:27:24 +0200 Subject: [PATCH 09/11] clean up function specifiers in cfdemCloudEnergy --- .../derived/cfdemCloudEnergy/cfdemCloudEnergy.H | 6 ++---- .../derived/cfdemCloudEnergy/cfdemCloudEnergyI.H | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.H b/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.H index ce039046..81f1b490 100644 --- a/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.H +++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergy.H @@ -98,15 +98,13 @@ public: label nrEnergyModels() const; - inline const wordList& energyModels() const; - bool implicitEnergyModel() const; int nrChemistryModels(); - inline const wordList& energyModels(); + inline const wordList& energyModels() const; - inline const wordList& chemistryModels(); + inline const wordList& chemistryModels() const; void energyContributions(volScalarField&); diff --git a/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergyI.H b/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergyI.H index 49e13c0f..99d623d9 100644 --- a/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergyI.H +++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudEnergy/cfdemCloudEnergyI.H @@ -30,7 +30,7 @@ inline const wordList& cfdemCloudEnergy::energyModels() const return energyModels_; } -inline const wordList& cfdemCloudEnergy::chemistryModels() +inline const wordList& cfdemCloudEnergy::chemistryModels() const { return chemistryModels_; } From c7fd297b682b912e44039e36722ead80bfff8c2b Mon Sep 17 00:00:00 2001 From: danielque Date: Wed, 3 Oct 2018 13:13:22 +0200 Subject: [PATCH 10/11] make couple() method of dataExchangeModel non-const method modifies at least one member that can be observed from outside (i.e. couplingStep_) --- .../dataExchangeModel/dataExchangeModel/dataExchangeModel.C | 2 +- .../dataExchangeModel/dataExchangeModel/dataExchangeModel.H | 4 ++-- .../subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C | 2 +- .../subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H | 2 +- .../dataExchangeModel/twoWayMany2Many/twoWayMany2Many.C | 2 +- .../dataExchangeModel/twoWayMany2Many/twoWayMany2Many.H | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.C index ddee3673..723db484 100755 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.C +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.C @@ -195,7 +195,7 @@ void dataExchangeModel::destroy(double* array) const //==== -bool dataExchangeModel::couple(int i) const +bool dataExchangeModel::couple(int i) { bool coupleNow = false; if (doCoupleNow()) diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H index e864bfee..1cfcce94 100755 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H @@ -62,7 +62,7 @@ protected: int maxNumberOfParticles_; - mutable int couplingStep_; + int couplingStep_; scalar DEMts_; @@ -176,7 +176,7 @@ public: virtual void destroy(double*) const; //==== - virtual bool couple(int) const; + virtual bool couple(int); virtual scalar timeStepFraction() const; diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C index 9d142ed1..875399fa 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C @@ -204,7 +204,7 @@ void twoWayMPI::destroy(double* array) const } //============ -bool twoWayMPI::couple(int i) const +bool twoWayMPI::couple(int i) { bool coupleNow = false; if (i==0) diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H index dbf40c9a..5c643534 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H @@ -151,7 +151,7 @@ public: void destroy(int*) const; //============== - bool couple(int) const; + bool couple(int); int getNumberOfParticles() const; int getNumberOfClumps() const; diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.C index bbdf952d..90334d17 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.C +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.C @@ -384,7 +384,7 @@ void inline twoWayMany2Many::destroy(int* array) const //============== -bool twoWayMany2Many::couple(int i) const +bool twoWayMany2Many::couple(int i) { bool coupleNow = false; if (i==0) diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.H index 96d8fc25..8c7e2db7 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.H +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.H @@ -201,7 +201,7 @@ public: void inline destroy(int*) const; //============== - bool couple(int) const; + bool couple(int); int getNumberOfParticles() const; int getNumberOfClumps() const; From 91c22cd1e1393632dce9fdd06abe7b06f6628e4b Mon Sep 17 00:00:00 2001 From: danielque Date: Thu, 4 Oct 2018 10:42:10 +0200 Subject: [PATCH 11/11] fix up some mutables in momCoupleModels --- src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H | 1 + src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H | 5 +++++ .../momCoupleModel/explicitCouple/explicitCouple.C | 4 ++-- .../momCoupleModel/explicitCouple/explicitCouple.H | 8 ++++---- .../momCoupleModel/implicitCouple/implicitCouple.C | 4 ++-- .../momCoupleModel/implicitCouple/implicitCouple.H | 8 ++++---- .../momCoupleModel/momCoupleModel/momCoupleModel.C | 4 ++-- .../momCoupleModel/momCoupleModel/momCoupleModel.H | 6 +++--- .../subModels/momCoupleModel/noCouple/noCouple.C | 2 +- .../subModels/momCoupleModel/noCouple/noCouple.H | 2 +- 10 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H index 2912d960..5b585395 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H @@ -378,6 +378,7 @@ public: inline const locateModel& locateM() const; + inline momCoupleModel& momCoupleM(int); inline const momCoupleModel& momCoupleM(int) const; inline dataExchangeModel& dataExchangeM(); diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H index 2ab8d0fe..504c1682 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H @@ -299,6 +299,11 @@ inline const locateModel& cfdemCloud::locateM() const return locateModel_; } +inline momCoupleModel& cfdemCloud::momCoupleM(int i) +{ + return momCoupleModel_[i]; +} + inline const momCoupleModel& cfdemCloud::momCoupleM(int i) const { return momCoupleModel_[i]; diff --git a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.C b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.C index da5238ac..ddf325fb 100644 --- a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.C +++ b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.C @@ -106,7 +106,7 @@ explicitCouple::~explicitCouple() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp explicitCouple::expMomSource() const +tmp explicitCouple::expMomSource() { const scalar tsf = particleCloud_.dataExchangeM().timeStepFraction(); @@ -136,7 +136,7 @@ tmp explicitCouple::expMomSource() const ); } -void explicitCouple::resetMomSourceField() const +void explicitCouple::resetMomSourceField() { fPrev_.ref() = fNext_.ref(); fNext_.primitiveFieldRef() = vector::zero; diff --git a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.H b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.H index 9ab43367..a343ae4e 100644 --- a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.H +++ b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.H @@ -58,9 +58,9 @@ private: dictionary propsDict_; - mutable volVectorField fPrev_; + volVectorField fPrev_; - mutable volVectorField fNext_; + volVectorField fNext_; vector fLimit_; // limit for for exchange field @@ -87,9 +87,9 @@ public: // Member Functions - tmp expMomSource() const; + tmp expMomSource(); - void resetMomSourceField() const; + void resetMomSourceField(); }; diff --git a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/implicitCouple/implicitCouple.C b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/implicitCouple/implicitCouple.C index fae64de7..9656eda8 100644 --- a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/implicitCouple/implicitCouple.C +++ b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/implicitCouple/implicitCouple.C @@ -120,7 +120,7 @@ implicitCouple::~implicitCouple() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp implicitCouple::impMomSource() const +tmp implicitCouple::impMomSource() { const scalar tsf = particleCloud_.dataExchangeM().timeStepFraction(); @@ -157,7 +157,7 @@ tmp implicitCouple::impMomSource() const ); } -void implicitCouple::resetMomSourceField() const +void implicitCouple::resetMomSourceField() { KslPrev_.ref() = KslNext_.ref(); KslNext_.primitiveFieldRef() = 0; diff --git a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/implicitCouple/implicitCouple.H b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/implicitCouple/implicitCouple.H index 209410c6..2ee1a8ca 100644 --- a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/implicitCouple/implicitCouple.H +++ b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/implicitCouple/implicitCouple.H @@ -73,9 +73,9 @@ private: scalar KslLimit_; // limit for for exchange field - mutable volScalarField KslPrev_; + volScalarField KslPrev_; - mutable volScalarField KslNext_; + volScalarField KslNext_; public: @@ -98,9 +98,9 @@ public: // Member Functions - tmp impMomSource() const; + tmp impMomSource(); - void resetMomSourceField() const; + void resetMomSourceField(); }; diff --git a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/momCoupleModel/momCoupleModel.C b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/momCoupleModel/momCoupleModel.C index 9478883a..9d6b4521 100644 --- a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/momCoupleModel/momCoupleModel.C +++ b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/momCoupleModel/momCoupleModel.C @@ -45,7 +45,7 @@ defineRunTimeSelectionTable(momCoupleModel, dictionary); // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp momCoupleModel::impMomSource() const +tmp momCoupleModel::impMomSource() { FatalError<<"the solver calls for impMomSource()\n" <<", please set 'momCoupleModel' to type 'implicitCouple'\n" @@ -55,7 +55,7 @@ tmp momCoupleModel::impMomSource() const return tsource; } -tmp momCoupleModel::expMomSource() const +tmp momCoupleModel::expMomSource() { FatalError<<"the solver calls for expMomSource()\n" <<", please set 'momCoupleModel' to type 'explicitCouple'\n" diff --git a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/momCoupleModel/momCoupleModel.H b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/momCoupleModel/momCoupleModel.H index 7e66ec7d..e1621957 100644 --- a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/momCoupleModel/momCoupleModel.H +++ b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/momCoupleModel/momCoupleModel.H @@ -111,12 +111,12 @@ public: // Member Functions // implicit momentum source field - virtual tmp impMomSource() const; + virtual tmp impMomSource(); // explicit momentum source field - virtual tmp expMomSource() const; + virtual tmp expMomSource(); - virtual void resetMomSourceField() const=0; + virtual void resetMomSourceField() = 0; virtual void setSourceField(volVectorField &) const; }; diff --git a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.C b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.C index ffd629ec..867b13c6 100644 --- a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.C +++ b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.C @@ -72,7 +72,7 @@ noCouple::~noCouple() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void noCouple::resetMomSourceField() const +void noCouple::resetMomSourceField() { FatalError<<"the solver calls for resetMomSourceField() although you use IB method where this is not needed!\n" <<", check your solver! - PANIC -\n"; diff --git a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.H b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.H index fb75ecb8..d2b65f4a 100644 --- a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.H +++ b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/noCouple/noCouple.H @@ -78,7 +78,7 @@ public: // Member Functions - void resetMomSourceField() const; + void resetMomSourceField(); };