mirror of
https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git
synced 2025-12-08 06:37:44 +00:00
apply some formatting changes [ci skip]
This commit is contained in:
@ -39,7 +39,7 @@ word compatibleLIGGGHTSversion="PFM 19.02";
|
|||||||
word OFversion="4.x";
|
word OFversion="4.x";
|
||||||
|
|
||||||
Info << "\nCFDEMcoupling version: " << CFDEMversion << endl;
|
Info << "\nCFDEMcoupling version: " << CFDEMversion << endl;
|
||||||
Info << ", compatible to LIGGGHTS version: " << compatibleLIGGGHTSversion << endl;
|
Info << "compatible to LIGGGHTS version: " << compatibleLIGGGHTSversion << endl;
|
||||||
Info << ", compatible to OpenFOAM version: " << OFversion << endl;
|
Info << "compatible to OpenFOAM version: " << OFversion << endl;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -665,7 +665,7 @@ bool cfdemCloud::evolve
|
|||||||
}
|
}
|
||||||
|
|
||||||
//============================================
|
//============================================
|
||||||
//CHECK JUST TIME-INTERPOATE ALREADY SMOOTHENED VOIDFRACTIONNEXT AND UsNEXT FIELD
|
//CHECK JUST TIME-INTERPOLATE ALREADY SMOOTHENED VOIDFRACTIONNEXT AND UsNEXT FIELD
|
||||||
// IMPLICIT FORCE CONTRIBUTION AND SOLVER USE EXACTLY THE SAME AVERAGED
|
// IMPLICIT FORCE CONTRIBUTION AND SOLVER USE EXACTLY THE SAME AVERAGED
|
||||||
// QUANTITIES AT THE GRID!
|
// QUANTITIES AT THE GRID!
|
||||||
scalar timeStepFrac = dataExchangeM().timeStepFraction();
|
scalar timeStepFrac = dataExchangeM().timeStepFraction();
|
||||||
|
|||||||
@ -186,15 +186,15 @@ public:
|
|||||||
|
|
||||||
inline int couplingInterval() const { return couplingInterval_; }
|
inline int couplingInterval() const { return couplingInterval_; }
|
||||||
|
|
||||||
inline scalar couplingTime() const { return couplingInterval_*DEMts_; }
|
inline scalar couplingTime() const { return couplingInterval_ * DEMts_; }
|
||||||
|
|
||||||
inline scalar TSstart() const { return particleCloud_.mesh().time().startTime().value()
|
inline scalar TSstart() const { return particleCloud_.mesh().time().startTime().value()
|
||||||
+ (couplingStep_-1) * couplingTime(); }
|
+ (couplingStep_-1) * couplingTime(); }
|
||||||
|
|
||||||
inline scalar TSend() const { return particleCloud_.mesh().time().startTime().value()
|
inline scalar TSend() const { return particleCloud_.mesh().time().startTime().value()
|
||||||
+ (couplingStep_) * couplingTime(); }
|
+ (couplingStep_ ) * couplingTime(); }
|
||||||
|
|
||||||
inline int DEMstepsTillT(scalar t) const { return (t - (particleCloud_.mesh().time().value() - couplingTime()) + SMALL) / DEMts_; }
|
inline int DEMstepsTillT(scalar t) const { return (t - (particleCloud_.mesh().time().value() - couplingTime()) + SMALL) / DEMts_; }
|
||||||
|
|
||||||
inline void checkTSsize() const
|
inline void checkTSsize() const
|
||||||
{
|
{
|
||||||
@ -210,7 +210,7 @@ public:
|
|||||||
Info << "particleCloud_.mesh().time().deltaT().value() = " << particleCloud_.mesh().time().deltaT().value() << endl;
|
Info << "particleCloud_.mesh().time().deltaT().value() = " << particleCloud_.mesh().time().deltaT().value() << endl;
|
||||||
Info << "couplingInterval_ = " << couplingInterval_ << endl;
|
Info << "couplingInterval_ = " << couplingInterval_ << endl;
|
||||||
Info << "DEMts_ = " << DEMts_ << endl;
|
Info << "DEMts_ = " << DEMts_ << endl;
|
||||||
Warning << "\nWarning - Coupling time (= DEM time step * coupling interval) is not a multiple of CFD time-step!\n" << endl;
|
Warning << "\nWarning - Coupling time (= DEM time step * coupling interval) is not a multiple of CFD time-step!\n" << endl;
|
||||||
}
|
}
|
||||||
if (!particleCloud_.allowCFDsubTimestep())
|
if (!particleCloud_.allowCFDsubTimestep())
|
||||||
if (particleCloud_.mesh().time().deltaT().value() < couplingInterval_ * DEMts_ + SMALL)
|
if (particleCloud_.mesh().time().deltaT().value() < couplingInterval_ * DEMts_ + SMALL)
|
||||||
|
|||||||
@ -66,7 +66,7 @@ twoWayMPI::twoWayMPI
|
|||||||
propsDict_(dict.subDict(typeName + "Props")),
|
propsDict_(dict.subDict(typeName + "Props")),
|
||||||
lmp(NULL)
|
lmp(NULL)
|
||||||
{
|
{
|
||||||
Info<<"Starting up LIGGGHTS for first time execution"<<endl;
|
Info << "Starting up LIGGGHTS for first time execution" << endl;
|
||||||
|
|
||||||
MPI_Comm_dup(MPI_COMM_WORLD, &comm_liggghts);
|
MPI_Comm_dup(MPI_COMM_WORLD, &comm_liggghts);
|
||||||
|
|
||||||
@ -74,8 +74,8 @@ twoWayMPI::twoWayMPI
|
|||||||
const fileName liggghtsPath(propsDict_.lookup("liggghtsPath"));
|
const fileName liggghtsPath(propsDict_.lookup("liggghtsPath"));
|
||||||
|
|
||||||
// open LIGGGHTS input script
|
// open LIGGGHTS input script
|
||||||
Info<<"Executing input script '"<< liggghtsPath.c_str() <<"'"<<endl;
|
Info << "Executing input script '" << liggghtsPath.c_str() << "'" << endl;
|
||||||
lmp = new LAMMPS_NS::LAMMPS(0,NULL,comm_liggghts);
|
lmp = new LAMMPS_NS::LAMMPS(0, NULL, comm_liggghts);
|
||||||
lmp->input->file(liggghtsPath.c_str());
|
lmp->input->file(liggghtsPath.c_str());
|
||||||
|
|
||||||
// get DEM time step size
|
// get DEM time step size
|
||||||
|
|||||||
@ -17,6 +17,11 @@ Description
|
|||||||
drag law for monodisperse systems according to
|
drag law for monodisperse systems according to
|
||||||
Beetstra et al. AIChE J 53.2 (2007)
|
Beetstra et al. AIChE J 53.2 (2007)
|
||||||
|
|
||||||
|
Reference
|
||||||
|
R. Beetstra, M.A. van der Hoef, J.A.M. Kuipers
|
||||||
|
"Drag force of intermediate Reynolds number flow past mono- and bidisperse arrays of spheres"
|
||||||
|
AIChE Journal, 53 (2007)
|
||||||
|
|
||||||
SourceFiles
|
SourceFiles
|
||||||
BeetstraDrag.C
|
BeetstraDrag.C
|
||||||
\*---------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
@ -86,12 +91,12 @@ protected:
|
|||||||
virtual void adaptVoidfraction(double&, label) const {}
|
virtual void adaptVoidfraction(double&, label) const {}
|
||||||
|
|
||||||
virtual scalar effDiameter(double d, label cellI, label index) const {return d;}
|
virtual scalar effDiameter(double d, label cellI, label index) const {return d;}
|
||||||
|
|
||||||
virtual scalar meanSauterDiameter(double d, label cellI) const {return d;}
|
virtual scalar meanSauterDiameter(double d, label cellI) const {return d;}
|
||||||
|
|
||||||
double F(double, double) const;
|
double F(double, double) const;
|
||||||
|
|
||||||
double terminalVelocity(double, double, double, double, double, double) const;
|
double terminalVelocity(double, double, double, double, double, double) const;
|
||||||
|
|
||||||
double a(double) const;
|
double a(double) const;
|
||||||
|
|
||||||
|
|||||||
@ -34,6 +34,11 @@ Description
|
|||||||
- splits off explicit drag component due to fluctuation in fluid and particle
|
- splits off explicit drag component due to fluctuation in fluid and particle
|
||||||
velocity (optional via forceSubModel "ImExCorr")
|
velocity (optional via forceSubModel "ImExCorr")
|
||||||
|
|
||||||
|
Reference
|
||||||
|
D. Gidaspow
|
||||||
|
"Multiphase flow and fluidization: Continuum and kinetic theory description",
|
||||||
|
1994
|
||||||
|
|
||||||
Class
|
Class
|
||||||
GidaspowDrag
|
GidaspowDrag
|
||||||
|
|
||||||
|
|||||||
@ -82,6 +82,7 @@ protected:
|
|||||||
|
|
||||||
List<Switch> switchesList_; // switches which are requested from dict
|
List<Switch> switchesList_; // switches which are requested from dict
|
||||||
|
|
||||||
|
// a Switch is set to false in the default Switch constructor
|
||||||
List<Switch> switches_; // switch status
|
List<Switch> switches_; // switch status
|
||||||
|
|
||||||
mutable volScalarField nu_;
|
mutable volScalarField nu_;
|
||||||
|
|||||||
@ -28,6 +28,12 @@ Description
|
|||||||
This code is designed to realize coupled CFD-DEM simulations using LIGGGHTS
|
This code is designed to realize coupled CFD-DEM simulations using LIGGGHTS
|
||||||
and OpenFOAM(R). Note: this code is not part of OpenFOAM(R) (see DISCLAIMER).
|
and OpenFOAM(R). Note: this code is not part of OpenFOAM(R) (see DISCLAIMER).
|
||||||
|
|
||||||
|
Reference
|
||||||
|
G. Wierink, C. Goniva, B. Niceno, K. Heiskanen,
|
||||||
|
"Mechanistic Modelling of Particle-Interface Interaction in Three-Phase Flows",
|
||||||
|
Proc. of the 8th Int. Conf. on CFD in Oil and Gas, Metallurgical and Process Industries,
|
||||||
|
Trondheim, 2011
|
||||||
|
|
||||||
Class
|
Class
|
||||||
interface
|
interface
|
||||||
|
|
||||||
|
|||||||
@ -28,6 +28,10 @@ Description
|
|||||||
This code is designed to realize coupled CFD-DEM simulations using LIGGGHTS
|
This code is designed to realize coupled CFD-DEM simulations using LIGGGHTS
|
||||||
and OpenFOAM(R). Note: this code is not part of OpenFOAM(R) (see DISCLAIMER).
|
and OpenFOAM(R). Note: this code is not part of OpenFOAM(R) (see DISCLAIMER).
|
||||||
|
|
||||||
|
Reference
|
||||||
|
Crowe, Clayton T.; Sommerfeld, Martin; Tsuji, Yutaka (1998).
|
||||||
|
"Multiphase flows with droplets and particles"
|
||||||
|
|
||||||
Class
|
Class
|
||||||
virtualMassForce
|
virtualMassForce
|
||||||
|
|
||||||
|
|||||||
@ -50,7 +50,7 @@ autoPtr<liggghtsCommandModel> liggghtsCommandModel::New
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
Info<< "Selecting liggghtsCommandModel "
|
Info<< "Selecting liggghtsCommandModel "
|
||||||
<< liggghtsCommandType << " ,provide dicts, numbered from 0 to n" << endl;
|
<< liggghtsCommandType << ", provide dicts, numbered from 0 to n" << endl;
|
||||||
|
|
||||||
dictionaryConstructorTable::iterator cstrIter =
|
dictionaryConstructorTable::iterator cstrIter =
|
||||||
dictionaryConstructorTablePtr_->find(liggghtsCommandType);
|
dictionaryConstructorTablePtr_->find(liggghtsCommandType);
|
||||||
|
|||||||
@ -94,7 +94,7 @@ writeLiggghts::writeLiggghts
|
|||||||
{
|
{
|
||||||
overwrite_ = Switch(propsDict_.lookup("overwrite"));
|
overwrite_ = Switch(propsDict_.lookup("overwrite"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (writeLast_)
|
if (writeLast_)
|
||||||
{
|
{
|
||||||
runLast_ = true;
|
runLast_ = true;
|
||||||
@ -103,7 +103,7 @@ writeLiggghts::writeLiggghts
|
|||||||
{
|
{
|
||||||
//Warning << "Using invalid options of writeLiggghts, please use 'writeLast' option." << endl;
|
//Warning << "Using invalid options of writeLiggghts, please use 'writeLast' option." << endl;
|
||||||
runEveryWriteStep_ = true;
|
runEveryWriteStep_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
command_ += " " + path_ + "/" + writeName_;
|
command_ += " " + path_ + "/" + writeName_;
|
||||||
|
|||||||
Reference in New Issue
Block a user