zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up whitespaces in src files

Browse Source
This commit is contained in:
danielque
2023-08-22 13:02:05 +02:00
parent ba069ab7b6
commit 21e6d64d52
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lagrangian/cfdemParticle/subModels/forceModel/staticPressure/staticPressure.C
View File

@ -65,7 +65,7 @@ staticPressure::staticPressure
voidfractionFieldName_(propsDict_.lookup("voidfractionFieldName")),
voidfraction_(sm.mesh().lookupObject<volScalarField> (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);
}
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/lagrangian/cfdemParticle/subModels/forceModel/staticPressure/staticPressure.H
View File

@ -66,15 +66,15 @@ private:
scalar rhoGas_;
vector g_;
word voidfractionFieldName_;
const volScalarField& voidfraction_;
scalar rhoPart_;
scalar solidFraction_;
public:
//- Runtime type information

6
src/lagrangian/cfdemParticle/subModels/otherForceModel/gravityEff/gravityEff.C
View File

@ -84,9 +84,9 @@ tmp<volVectorField> 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();

2
src/lagrangian/cfdemParticle/subModels/otherForceModel/gravityEff/gravityEff.H
View File

@ -62,7 +62,7 @@ protected:
const uniformDimensionedVectorField& g_;// ref to gravity
dimensionedScalar rhoPart_;
const volScalarField& unity_;
public: