diff --git a/src/lagrangian/cfdemParticle/cfdTools/debugInfo.H b/src/lagrangian/cfdemParticle/cfdTools/debugInfo.H index 285e291f..f5968190 100755 --- a/src/lagrangian/cfdemParticle/cfdTools/debugInfo.H +++ b/src/lagrangian/cfdemParticle/cfdTools/debugInfo.H @@ -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; diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H index b17b6381..0f74cc1f 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H @@ -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;} diff --git a/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.C b/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.C index c8d1cd22..ca82ba2d 100644 --- a/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.C +++ b/src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.C @@ -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); diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C index 58677ad3..b37eaba7 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C @@ -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; diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C index c15da1e1..8a7deab9 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C @@ -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 { diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.C b/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.C index e229c15e..08fbf8b3 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/ErgunStatFines.C @@ -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; diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/FanningDynFines.C b/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/FanningDynFines.C index 29cbdd36..0dffe38b 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/FanningDynFines.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/Fines/FanningDynFines.C @@ -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 diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.C index 57bb5d3c..826d2a76 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.C @@ -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; diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.C index 7368d942..23f866ab 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.C @@ -157,12 +157,12 @@ void KochHillDrag::setForce() const for (int index = 0; index -1) // particle Found diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C index 616069c8..5303c7fd 100755 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C @@ -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 diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/forceModel/forceModel.C b/src/lagrangian/cfdemParticle/subModels/forceModel/forceModel/forceModel.C index 0b593924..4abb55af 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceModel/forceModel.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceModel/forceModel.C @@ -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()), diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForce/gradPForce.C b/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForce/gradPForce.C index 586579b7..ed8481ad 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForce/gradPForce.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForce/gradPForce.C @@ -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 diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/interface/interface.C b/src/lagrangian/cfdemParticle/subModels/forceModel/interface/interface.C index ad77200e..33b44627 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/interface/interface.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/interface/interface.C @@ -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) diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/viscForce/viscForce.C b/src/lagrangian/cfdemParticle/subModels/forceModel/viscForce/viscForce.C index 30762ce8..23b3298a 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/viscForce/viscForce.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/viscForce/viscForce.C @@ -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 diff --git a/src/lagrangian/cfdemParticle/subModels/forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C b/src/lagrangian/cfdemParticle/subModels/forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C index 7cb38d76..1bebcc2a 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C @@ -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 { diff --git a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.C b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.C index 46e99223..da5238ac 100644 --- a/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.C +++ b/src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.C @@ -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) diff --git a/src/lagrangian/cfdemParticle/subModels/otherForceModel/expParticleForces/expParticleForces.C b/src/lagrangian/cfdemParticle/subModels/otherForceModel/expParticleForces/expParticleForces.C index e7818931..3e91a9aa 100644 --- a/src/lagrangian/cfdemParticle/subModels/otherForceModel/expParticleForces/expParticleForces.C +++ b/src/lagrangian/cfdemParticle/subModels/otherForceModel/expParticleForces/expParticleForces.C @@ -69,7 +69,7 @@ tmp 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 ) ) ); diff --git a/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravity/gravity.C b/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravity/gravity.C index b4fcfe8e..3753b121 100644 --- a/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravity/gravity.C +++ b/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravity/gravity.C @@ -74,7 +74,7 @@ tmp 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 ) ) ); diff --git a/src/lagrangian/cfdemParticle/subModels/otherForceModel/weightSecondaryPhase/weightSecondaryPhase.C b/src/lagrangian/cfdemParticle/subModels/otherForceModel/weightSecondaryPhase/weightSecondaryPhase.C index 6e6fba8d..69d5ef63 100644 --- a/src/lagrangian/cfdemParticle/subModels/otherForceModel/weightSecondaryPhase/weightSecondaryPhase.C +++ b/src/lagrangian/cfdemParticle/subModels/otherForceModel/weightSecondaryPhase/weightSecondaryPhase.C @@ -78,7 +78,7 @@ tmp 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 ) ) );