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

replace vector(0,0,0) with vector::zero

Browse Source
This commit is contained in:
danielque
2018-03-27 15:25:30 +02:00
parent 148990499d
commit 8754ca5952
19 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lagrangian/cfdemParticle/cfdTools/debugInfo.H
View File

@ -69,8 +69,8 @@
else
{
meanAlpha_field = 0;
meanU_field = vector(0,0,0);
meanUs_field = vector(0,0,0);
meanU_field = vector::zero;
meanUs_field = vector::zero;
}
meanUs_array /= numberOfParticles()+SMALL;
meanR_array /= numberOfParticles()+SMALL;

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

@ -330,11 +330,11 @@ public:
//access to the particle's rotation and torque data
virtual inline double ** DEMTorques() const {return NULL;}
virtual inline double ** omegaArray() const {return NULL;}
virtual vector omega(int) const {return vector(0,0,0);}
virtual vector omega(int) const {return vector::zero;}
//access to the particles' orientation information
virtual inline double ** exArray() const {return NULL;}
virtual vector ex(int) const {return vector(0,0,0);}
virtual vector ex(int) const {return vector::zero;}
//Detector if SRF module is enable or not
virtual inline bool SRFOn(){return false;}

2
src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.C
View File

@ -81,7 +81,7 @@ void averagingModel::undoVectorAverage
if(weightField[cellI] == weightP)
{
fieldNext[cellI] = vector(0,0,0);
fieldNext[cellI] = vector::zero;
}else
{
fieldNext[cellI] = (fieldNext[cellI]*weightField[cellI]-valueVec*weightP)/(weightField[cellI]-weightP);

6
src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C
View File

@ -137,9 +137,9 @@ void BeetstraDrag::setForce() const
for(int index = 0; index < particleCloud_.numberOfParticles(); ++index)
{
cellI = particleCloud_.cellIDs()[index][0];
drag = vector(0,0,0);
dragExplicit = vector(0,0,0);
Ufluid =vector(0,0,0);
drag = vector::zero;
dragExplicit = vector::zero;
Ufluid = vector::zero;
voidfraction=0;
dragCoefficient = 0;

6
src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C
View File

@ -148,10 +148,10 @@ void DiFeliceDrag::setForce() const
for(int index = 0; index < particleCloud_.numberOfParticles(); ++index)
{
cellI = particleCloud_.cellIDs()[index][0];
drag = vector(0,0,0);
dragExplicit = vector(0,0,0);
drag = vector::zero;
dragExplicit = vector::zero;
dragCoefficient=0;
Ufluid =vector(0,0,0);
Ufluid = vector::zero;
if (cellI > -1) // particle Found
{

6
src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.C
View File

@ -164,10 +164,10 @@ void ErgunStatFines::setForce() const
for(int index = 0; index < particleCloud_.numberOfParticles(); ++index)
{
cellI = particleCloud_.cellIDs()[index][0];
drag = vector(0,0,0);
dragExplicit = vector(0,0,0);
drag = vector::zero;
dragExplicit = vector::zero;
betaP = 0;
Ufluid = vector(0,0,0);
Ufluid = vector::zero;
voidfraction = 0;
dragCoefficient = 0;

4
src/lagrangian/cfdemParticle/subModels/forceModel/Fines/FanningDynFines.C
View File

@ -120,8 +120,8 @@ void FanningDynFines::setForce() const
for(int index = 0; index < particleCloud_.numberOfParticles(); ++index)
{
cellI = particleCloud_.cellIDs()[index][0];
drag = vector(0,0,0);
UDyn = vector(0,0,0);
drag = vector::zero;
UDyn = vector::zero;
dragCoefficient = 0;
if (cellI > -1) // particle found

6
src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.C
View File

@ -159,11 +159,11 @@ void GidaspowDrag::setForce() const
//if(mask[index][0])
//{
cellI = particleCloud_.cellIDs()[index][0];
drag = vector(0,0,0);
dragExplicit = vector(0,0,0);
drag = vector::zero;
dragExplicit = vector::zero;
betaP = 0;
Vs = 0;
Ufluid = vector(0,0,0);
Ufluid = vector::zero;
voidfraction = 0;
dragCoefficient = 0;

6
src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.C
View File

@ -157,12 +157,12 @@ void KochHillDrag::setForce() const
for (int index = 0; index<particleCloud_.numberOfParticles(); ++index)
{
cellI = particleCloud_.cellIDs()[index][0];
drag = vector(0,0,0);
dragExplicit = vector(0,0,0);
drag = vector::zero;
dragExplicit = vector::zero;
dragCoefficient = 0;
betaP = 0;
Vs = 0;
Ufluid = vector(0,0,0);
Ufluid = vector::zero;
voidfraction = 0;
if (cellI > -1) // particle Found

6
src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C
View File

@ -200,12 +200,12 @@ void KochHillRWDrag::setForce() const
//if (mask[index][0])
//{
cellI = particleCloud_.cellIDs()[index][0];
drag = vector(0,0,0);
dragExplicit = vector(0,0,0);
drag = vector::zero;
dragExplicit = vector::zero;
dragCoefficient = 0;
betaP = 0;
Vs = 0;
Ufluid = vector(0,0,0);
Ufluid = vector::zero;
// Pout << "RW-TEST: cellI = " << cellI << endl; // TEST-Output
if (cellI > -1) // particle Found

4
src/lagrangian/cfdemParticle/subModels/forceModel/forceModel/forceModel.C
View File

@ -69,7 +69,7 @@ forceModel::forceModel
IOobject::AUTO_WRITE
),
sm.mesh(),
dimensionedVector("zero", dimensionSet(1,1,-2,0,0), vector(0,0,0)) // N
dimensionedVector("zero", dimensionSet(1,1,-2,0,0), vector::zero) // N
),
expParticleForces_
( IOobject
@ -81,7 +81,7 @@ forceModel::forceModel
IOobject::AUTO_WRITE
),
sm.mesh(),
dimensionedVector("zero", dimensionSet(1,1,-2,0,0), vector(0,0,0)) // N
dimensionedVector("zero", dimensionSet(1,1,-2,0,0), vector::zero) // N
),
coupleForce_(true),
modelType_(sm.modelType()),

2
src/lagrangian/cfdemParticle/subModels/forceModel/gradPForce/gradPForce.C
View File

@ -160,7 +160,7 @@ void gradPForce::setForce() const
{
//if(mask[index][0])
//{
force = vector(0,0,0);
force = vector::zero;
cellI = particleCloud_.cellIDs()[index][0];
if (cellI > -1) // particle Found

2
src/lagrangian/cfdemParticle/subModels/forceModel/interface/interface.C
View File

@ -142,7 +142,7 @@ Info << "interface::setForce" << endl;
}
// Initialize an interfaceForce vector
vector interfaceForce = Foam::vector(0,0,0);
vector interfaceForce = Foam::vector::zero;
// Calculate the interfaceForce (range of alphap needed for stability)

2
src/lagrangian/cfdemParticle/subModels/forceModel/viscForce/viscForce.C
View File

@ -142,7 +142,7 @@ void viscForce::setForce() const
{
//if(mask[index][0])
//{
force=vector(0,0,0);
force = vector::zero;
cellI = particleCloud_.cellIDs()[index][0];
if (cellI > -1) // particle Found

2
src/lagrangian/cfdemParticle/subModels/forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C
View File

@ -156,7 +156,7 @@ void DiFeliceDragMS::setForce() const
//{
cellI = cloudRefMS().cellIDCM(index);
drag = vector(0,0,0);
drag = vector::zero;
if (cellI > -1) // particle Found
{

4
src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.C
View File

@ -73,7 +73,7 @@ explicitCouple::explicitCouple
IOobject::NO_WRITE
),
sm.mesh(),
dimensionedVector("zero", dimensionSet(1,-2,-2,0,0), vector(0,0,0)), // N/m3
dimensionedVector("zero", dimensionSet(1,-2,-2,0,0), vector::zero), // N/m3
"zeroGradient"
),
fNext_
@ -86,7 +86,7 @@ explicitCouple::explicitCouple
IOobject::NO_WRITE
),
sm.mesh(),
dimensionedVector("zero", dimensionSet(1,-2,-2,0,0), vector(0,0,0)), // N/m3
dimensionedVector("zero", dimensionSet(1,-2,-2,0,0), vector::zero), // N/m3
"zeroGradient"
),
fLimit_(1e10,1e10,1e10)

2
src/lagrangian/cfdemParticle/subModels/otherForceModel/expParticleForces/expParticleForces.C
View File

@ -69,7 +69,7 @@ tmp<volVectorField> expParticleForces::exportForceField()
particleCloud_.mesh(),
dimensionedVector
(
"zero",dimensionSet(1, -2, -2, 0, 0),vector(0,0,0)
"zero",dimensionSet(1, -2, -2, 0, 0),vector::zero
)
)
);

2
src/lagrangian/cfdemParticle/subModels/otherForceModel/gravity/gravity.C
View File

@ -74,7 +74,7 @@ tmp<volVectorField> gravity::exportForceField()
particleCloud_.mesh(),
dimensionedVector
(
"zero",dimensionSet(1, -2, -2, 0, 0),vector(0,0,0)
"zero",dimensionSet(1, -2, -2, 0, 0),vector::zero
)
)
);

2
src/lagrangian/cfdemParticle/subModels/otherForceModel/weightSecondaryPhase/weightSecondaryPhase.C
View File

@ -78,7 +78,7 @@ tmp<volVectorField> weightSecondaryPhase::exportForceField()
particleCloud_.mesh(),
dimensionedVector
(
"zero",dimensionSet(1, -2, -2, 0, 0),vector(0,0,0)
"zero",dimensionSet(1, -2, -2, 0, 0),vector::zero
)
)
);