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

clean up whitespaces

Browse Source 
nowadays editors could do this automatically ...
This commit is contained in:
danielque
2017-02-21 10:21:43 +01:00
parent 678bb3b2cf
commit 6439975233
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
View File

@ -114,7 +114,7 @@ cfdemCloud::cfdemCloud
treatVoidCellsAsExplicitForce_(false),
useDDTvoidfraction_(false),
ddtVoidfraction_
(
(
IOobject
(
"ddtVoidfraction",
@ -232,14 +232,14 @@ cfdemCloud::cfdemCloud
if (couplingProperties_.found("limitDEMForces"))
{
limitDEMForces_=true;
maxDEMForce_ = readScalar(couplingProperties_.lookup("limitDEMForces"));
maxDEMForce_ = readScalar(couplingProperties_.lookup("limitDEMForces"));
}
if (turbulenceModelType_=="LESProperties")
Info << "WARNING - LES functionality not yet tested!" << endl;
if (couplingProperties_.found("useDDTvoidfraction"))
useDDTvoidfraction_=true;
else
else
Info << "ignoring ddt(voidfraction)" << endl;
forceModel_ = new autoPtr<forceModel>[nrForceModels()];
@ -276,7 +276,7 @@ cfdemCloud::cfdemCloud
i
);
}
otherForceModel_ = new autoPtr<otherForceModel>[otherForceModels_.size()];
for (int i=0;i<otherForceModels_.size();i++)
{
@ -289,7 +289,7 @@ cfdemCloud::cfdemCloud
}
dataExchangeM().setCG();
if (!cgOK_ && cg_ > 1) FatalError<< "at least one of your models is not fit for cg !!!"<< abort(FatalError);
if (!cgOK_ && cg_ > 1) FatalError<< "at least one of your models is not fit for cg !!!"<< abort(FatalError);
}
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * //
@ -366,17 +366,18 @@ void cfdemCloud::setForces()
resetArray(DEMForces_,numberOfParticles(),3);
resetArray(Cds_,numberOfParticles(),1);
for (int i=0;i<cfdemCloud::nrForceModels();i++) cfdemCloud::forceM(i).setForce();
if (limitDEMForces_)
{
scalar maxF = 0.0;
for (int index = 0;index < numberOfParticles(); ++index)
{
scalar F = mag(expForce(index));
if (F > maxF) maxF = F;
if (F > maxDEMForce_)
for(int i=0;i<3;i++) DEMForces_[index][i] *= maxDEMForce_/F;
}
Info << "largest particle-fluid interaction on particle: " << maxF << endl;
for (int index = 0;index < numberOfParticles(); ++index)
{
scalar F = mag(expForce(index));
if (F > maxF) maxF = F;
if (F > maxDEMForce_)
for(int i=0;i<3;i++) DEMForces_[index][i] *= maxDEMForce_/F;
}
Info << "largest particle-fluid interaction on particle: " << maxF << endl;
}
}
@ -533,7 +534,7 @@ bool cfdemCloud::evolve
clockM().start(16,"resetVolFields");
if(verbose_)
{
Info << "couplingStep:" << dataExchangeM().couplingStep()
Info << "couplingStep:" << dataExchangeM().couplingStep()
<< "\n- resetVolFields()" << endl;
}
averagingM().resetVectorAverage(averagingM().UsPrev(),averagingM().UsNext(),false);
@ -571,21 +572,21 @@ bool cfdemCloud::evolve
setVectorAverages();
//Smoothen "next" fields
//Smoothen "next" fields
smoothingM().dSmoothing();
smoothingM().smoothen(voidFractionM().voidFractionNext());
//only smoothen if we use implicit force coupling in cells void of particles
//because we need unsmoothened Us field to detect cells for explicit
//because we need unsmoothened Us field to detect cells for explicit
//force coupling
if(!treatVoidCellsAsExplicitForce())
smoothingM().smoothenReferenceField(averagingM().UsNext());
clockM().stop("setVectorAverage");
}
//============================================
//CHECK JUST TIME-INTERPOATE ALREADY SMOOTHENED VOIDFRACTIONNEXT AND UsNEXT FIELD
//CHECK JUST TIME-INTERPOATE ALREADY SMOOTHENED VOIDFRACTIONNEXT AND UsNEXT FIELD
// IMPLICIT FORCE CONTRIBUTION AND SOLVER USE EXACTLY THE SAME AVERAGED
// QUANTITIES AT THE GRID!
Info << "\n timeStepFraction() = " << dataExchangeM().timeStepFraction() << endl;
@ -729,7 +730,7 @@ void cfdemCloud::calcDdtVoidfraction(volScalarField& voidfraction) const
/*tmp<fvVectorMatrix> cfdemCloud::ddtVoidfractionU(volVectorField& U,volScalarField& voidfraction) const
{
if (dataExchangeM().couplingStep() <= 2) return fvm::ddt(U);
return fvm::ddt(voidfraction,U);
}*/

20
src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
View File

@ -91,9 +91,9 @@ protected:
bool verbose_;
bool ignore_;
bool limitDEMForces_;
scalar maxDEMForce_;
const word modelType_;
@ -139,7 +139,7 @@ protected:
const wordList momCoupleModels_;
const wordList liggghtsCommandModelList_;
const wordList otherForceModels_;
const word turbulenceModelType_;
@ -185,7 +185,7 @@ protected:
autoPtr<meshMotionModel> meshMotionModel_;
autoPtr<liggghtsCommandModel>* liggghtsCommand_;
autoPtr<otherForceModel>* otherForceModel_;
// Protected member functions
@ -235,7 +235,7 @@ public:
vector position(int);
vector velocity(int);
vector expForce(int);
vector fluidVel(int);
@ -243,7 +243,7 @@ public:
virtual const forceModel& forceM(int);
virtual int nrForceModels();
virtual int nrMomCoupleModels();
scalar voidfraction(int);
@ -366,12 +366,12 @@ public:
inline autoPtr<liggghtsCommandModel>* liggghtsCommand() const;
inline const turbulenceModel& turbulence() const;
// Write
// write cfdemCloud internal data
virtual bool evolve(volScalarField&,volVectorField&,volVectorField&);
virtual void postFlow() {}
virtual bool reAllocArrays();
@ -400,8 +400,8 @@ public:
std::vector< std::vector<double*> >* getVprobe();
std::vector< std::vector<double> >* getSprobe();
void otherForces(volVectorField&);
void otherForces(volVectorField&);
};