diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/staticPressure/staticPressure.C b/src/lagrangian/cfdemParticle/subModels/forceModel/staticPressure/staticPressure.C index 8cddc1e5..719ebada 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/staticPressure/staticPressure.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/staticPressure/staticPressure.C @@ -65,7 +65,7 @@ staticPressure::staticPressure voidfractionFieldName_(propsDict_.lookup("voidfractionFieldName")), voidfraction_(sm.mesh().lookupObject (voidfractionFieldName_)), rhoPart_(readScalar(propsDict_.lookup ("rhoPart"))), - solidFraction_(readScalar(propsDict_.lookup ("DomainSolidVolumeFraction"))) + solidFraction_(readScalar(propsDict_.lookup ("DomainSolidVolumeFraction"))) { // init force sub model setForceSubModels(propsDict_); @@ -84,7 +84,7 @@ void staticPressure::setForce() const { #include "setupProbeModel.H" label cellI; - scalar rhoMix_ = solidFraction_*rhoPart_ + (1.0-solidFraction_)*rhoGas_; + scalar rhoMix_ = solidFraction_*rhoPart_ + (1.0-solidFraction_)*rhoGas_; vector force; for(int index = 0; index < particleCloud_.numberOfParticles(); ++index) @@ -96,10 +96,10 @@ void staticPressure::setForce() const scalar Vs = particleCloud_.particleVolume(index); // set force on particle force = -Vs * rhoMix_ * g_; - } + } // write particle based data to global array forceSubM(0).partToArray(index,force,vector::zero); - } + } } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/staticPressure/staticPressure.H b/src/lagrangian/cfdemParticle/subModels/forceModel/staticPressure/staticPressure.H index 5d29a672..51f556bc 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/staticPressure/staticPressure.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/staticPressure/staticPressure.H @@ -66,15 +66,15 @@ private: scalar rhoGas_; vector g_; - + word voidfractionFieldName_; - + const volScalarField& voidfraction_; - + scalar rhoPart_; - + scalar solidFraction_; - + public: //- Runtime type information diff --git a/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravityEff/gravityEff.C b/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravityEff/gravityEff.C index 83c8216f..52c585f4 100644 --- a/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravityEff/gravityEff.C +++ b/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravityEff/gravityEff.C @@ -84,9 +84,9 @@ tmp gravityEff::exportForceField() ) ) ); - - if (propsDict_.found("rhoPart")) - { + + if (propsDict_.found("rhoPart")) + { //Mixture (gas and solid) density based on whole domain dimensionedScalar rhoMix_ = fvc::domainIntegrate((1.0-voidfraction_) * rhoPart_ + voidfraction_ * rhoG_) / fvc::domainIntegrate(unity_); volVectorField& source = tsource.ref(); diff --git a/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravityEff/gravityEff.H b/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravityEff/gravityEff.H index 13f54b2d..48ea4fed 100644 --- a/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravityEff/gravityEff.H +++ b/src/lagrangian/cfdemParticle/subModels/otherForceModel/gravityEff/gravityEff.H @@ -62,7 +62,7 @@ protected: const uniformDimensionedVectorField& g_;// ref to gravity dimensionedScalar rhoPart_; - + const volScalarField& unity_; public: