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

Added missing files.

Browse Source
This commit is contained in:
tlichtenegger
2019-04-24 13:25:30 +02:00
parent f87ad1d116
commit 2d4fc39eef
6 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/rcfdemSolverRhoSteadyPimple/limitP.H Normal file
View File

@ -0,0 +1,2 @@
p = max(p, pMin);
p = min(p, pMax);

11
applications/solvers/rcfdemSolverRhoSteadyPimple/limitU.H Normal file
View File

@ -0,0 +1,11 @@
if (UMax.value() > 0)
{
forAll(U,cellI)
{
scalar mU(mag(U[cellI]));
if (mU > UMax.value())
{
U[cellI] *= UMax.value() / mU;
}
}
}

1
src/lagrangian/cfdemParticle/Make/files
View File

@ -76,6 +76,7 @@ $(forceModels)/volWeightedAverage/volWeightedAverage.C
$(forceModels)/deactivateForce/deactivateForce.C $(forceModels)/deactivateForce/deactivateForce.C
$(forceModels)/freeStreaming/freeStreaming.C $(forceModels)/freeStreaming/freeStreaming.C
$(forceModels)/isotropicFluctuations/isotropicFluctuations.C $(forceModels)/isotropicFluctuations/isotropicFluctuations.C
$(forceModels)/directionForcedFluctuations/directionForcedFluctuations.C
$(forceModels)/evaluateFluctuations/evaluateFluctuations.C $(forceModels)/evaluateFluctuations/evaluateFluctuations.C
$(forceModels)/directedDiffusiveRelaxation/directedDiffusiveRelaxation.C $(forceModels)/directedDiffusiveRelaxation/directedDiffusiveRelaxation.C
$(forceModels)/potentialRelaxation/potentialRelaxation.C $(forceModels)/potentialRelaxation/potentialRelaxation.C

12
src/lagrangian/cfdemParticle/subModels/forceModel/isotropicFluctuations/isotropicFluctuations.C
View File

@ -51,11 +51,12 @@ addToRunTimeSelectionTable
isotropicFluctuations::isotropicFluctuations isotropicFluctuations::isotropicFluctuations
( (
const dictionary& dict, const dictionary& dict,
cfdemCloud& sm cfdemCloud& sm,
word type
) )
: :
forceModel(dict,sm), forceModel(dict,sm),
propsDict_(dict.subDict(typeName + "Props")), propsDict_(dict.subDict(type + "Props")),
interpolate_(propsDict_.lookupOrDefault<bool>("interpolation", false)), interpolate_(propsDict_.lookupOrDefault<bool>("interpolation", false)),
measureDiff_(propsDict_.lookupOrDefault<bool>("measureDiff", false)), measureDiff_(propsDict_.lookupOrDefault<bool>("measureDiff", false)),
recErrorFile_("recurrenceError"), recErrorFile_("recurrenceError"),
@ -87,7 +88,7 @@ isotropicFluctuations::isotropicFluctuations
if(ignoreCellsName_ != "none") if(ignoreCellsName_ != "none")
{ {
ignoreCells_.set(new cellSet(particleCloud_.mesh(),ignoreCellsName_)); ignoreCells_.set(new cellSet(particleCloud_.mesh(),ignoreCellsName_));
Info << "isotropicFluctuations: ignoring fluctuations in cellSet " << ignoreCells_().name() << Info << type << ": ignoring fluctuations in cellSet " << ignoreCells_().name() <<
" with " << ignoreCells_().size() << " cells." << endl; " with " << ignoreCells_().size() << " cells." << endl;
} }
else existIgnoreCells_ = false; else existIgnoreCells_ = false;
@ -156,7 +157,7 @@ void isotropicFluctuations::setForce() const
if(deltaVoidfrac>0) if(deltaVoidfrac>0)
{ {
D = D0Field_[cellI]; D = D0Field_[cellI];
flucU=unitRndVec()*fluctuationMag(relVolfractionExcess,D); flucU=unitFlucDir()*fluctuationMag(relVolfractionExcess,D);
} }
// write particle based data to global array // write particle based data to global array
@ -192,8 +193,9 @@ scalar isotropicFluctuations::fluctuationMag(const scalar relVolfractionExcess,
} }
} }
vector isotropicFluctuations::unitRndVec() const vector isotropicFluctuations::unitFlucDir() const
{ {
// unit random vector
// algorithm according to: // algorithm according to:
// Marsaglia. "Choosing a point from the surface of a sphere." The Annals of Mathematical Statistics 43.2 (1972): 645-646. // Marsaglia. "Choosing a point from the surface of a sphere." The Annals of Mathematical Statistics 43.2 (1972): 645-646.
scalar v1(0.0); scalar v1(0.0);

7
src/lagrangian/cfdemParticle/subModels/forceModel/isotropicFluctuations/isotropicFluctuations.H
View File

@ -44,7 +44,7 @@ class isotropicFluctuations
: :
public forceModel public forceModel
{ {
private: protected:
dictionary propsDict_; dictionary propsDict_;
bool interpolate_; bool interpolate_;
@ -78,7 +78,7 @@ private:
const scalar dtDEM_; const scalar dtDEM_;
vector unitRndVec() const; virtual vector unitFlucDir() const;
scalar fluctuationMag(const scalar, const scalar) const; scalar fluctuationMag(const scalar, const scalar) const;
@ -98,7 +98,8 @@ public:
isotropicFluctuations isotropicFluctuations
( (
const dictionary& dict, const dictionary& dict,
cfdemCloud& sm cfdemCloud& sm,
word type = "isotropicFluctuations"
); );
// Destructor // Destructor

1
src/lagrangian/cfdemParticleComp/Make/files
View File

@ -71,6 +71,7 @@ $(forceModels)/particleCellVolume/particleCellVolume.C
$(forceModels)/deactivateForce/deactivateForce.C $(forceModels)/deactivateForce/deactivateForce.C
$(forceModels)/freeStreaming/freeStreaming.C $(forceModels)/freeStreaming/freeStreaming.C
$(forceModels)/isotropicFluctuations/isotropicFluctuations.C $(forceModels)/isotropicFluctuations/isotropicFluctuations.C
$(forceModels)/directionForcedFluctuations/directionForcedFluctuations.C
$(forceModels)/evaluateFluctuations/evaluateFluctuations.C $(forceModels)/evaluateFluctuations/evaluateFluctuations.C
$(forceModels)/directedDiffusiveRelaxation/directedDiffusiveRelaxation.C $(forceModels)/directedDiffusiveRelaxation/directedDiffusiveRelaxation.C
$(forceModels)/BeetstraDrag/BeetstraDrag.C $(forceModels)/BeetstraDrag/BeetstraDrag.C