mirror of
https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git
synced 2025-12-08 06:37:44 +00:00
Option to deactivate model check.
This commit is contained in:
@ -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;
|
||||
}
|
||||
|
||||
@ -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)),
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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_;
|
||||
|
||||
Reference in New Issue
Block a user