zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2018-02-12 11:48:48 +00:00
parent 5bff8d9dd1 1a7a489c7e
commit c5f074cea8
2 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
View File

@ -198,7 +198,7 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
scalar volumep = pi/6.0*pow3(diameter); scalar volumep = pi/6.0*pow3(diameter);
scalar volumeTot = massTotal_/rho; scalar volumeTot = massTotal_/rho;
nP = (volumeFraction*volumeTot + delayedVolume_)/(parcels*volumep); nP = volumeFraction*volumeTot/(parcels*volumep);
break; break;
} }
case pbNumber: case pbNumber:
@ -274,8 +274,7 @@ Foam::InjectionModel<CloudType>::InjectionModel(CloudType& owner)
parcelBasis_(pbNumber), parcelBasis_(pbNumber),
nParticleFixed_(0.0), nParticleFixed_(0.0),
time0_(0.0), time0_(0.0),
timeStep0_(this->template getModelProperty<scalar>("timeStep0")), timeStep0_(this->template getModelProperty<scalar>("timeStep0"))
delayedVolume_(0.0)
{} {}
@ -302,8 +301,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
parcelBasis_(pbNumber), parcelBasis_(pbNumber),
nParticleFixed_(0.0), nParticleFixed_(0.0),
time0_(owner.db().time().value()), time0_(owner.db().time().value()),
timeStep0_(this->template getModelProperty<scalar>("timeStep0")), timeStep0_(this->template getModelProperty<scalar>("timeStep0"))
delayedVolume_(0.0)
{ {
// Provide some info // Provide some info
// - also serves to initialise mesh dimensions - needed for parallel runs // - also serves to initialise mesh dimensions - needed for parallel runs
@ -369,8 +367,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
parcelBasis_(im.parcelBasis_), parcelBasis_(im.parcelBasis_),
nParticleFixed_(im.nParticleFixed_), nParticleFixed_(im.nParticleFixed_),
time0_(im.time0_), time0_(im.time0_),
timeStep0_(im.timeStep0_), timeStep0_(im.timeStep0_)
delayedVolume_(im.delayedVolume_)
{} {}
@ -428,8 +425,6 @@ void Foam::InjectionModel<CloudType>::inject
if (prepareForNextTimeStep(time, newParcels, newVolumeFraction)) if (prepareForNextTimeStep(time, newParcels, newVolumeFraction))
{ {
scalar delayedVolume = 0;
const scalar trackTime = this->owner().solution().trackTime(); const scalar trackTime = this->owner().solution().trackTime();
const polyMesh& mesh = this->owner().mesh(); const polyMesh& mesh = this->owner().mesh();
@ -505,30 +500,21 @@ void Foam::InjectionModel<CloudType>::inject
pPtr->rho() pPtr->rho()
); );
if (pPtr->nParticle() >= 1.0) parcelsAdded ++;
{
parcelsAdded++;
massAdded += pPtr->nParticle()*pPtr->mass();
if (pPtr->move(cloud, td, dt)) massAdded += pPtr->nParticle()*pPtr->mass();
{
cloud.addParticle(pPtr); if (pPtr->move(cloud, td, dt))
} {
else cloud.addParticle(pPtr);
{
delete pPtr;
}
} }
else else
{ {
delayedVolume += pPtr->nParticle()*pPtr->volume();
delete pPtr; delete pPtr;
} }
} }
} }
} }
delayedVolume_ = delayedVolume;
} }
postInjectCheck(parcelsAdded, massAdded); postInjectCheck(parcelsAdded, massAdded);

6
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -134,10 +134,6 @@ protected:
//- Time at start of injection time step [s] //- Time at start of injection time step [s]
scalar timeStep0_; scalar timeStep0_;
//- Volume that should have been injected, but would lead to
// less than 1 particle per parcel
scalar delayedVolume_;
// Protected Member Functions // Protected Member Functions