songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: ConeInjection - randomised the injector order. See #2199

Browse Source 
For cases where the number of injectors exceeded the number of parcels to
inject, processing the injectors sequentially led to not all injector locations
being active and yielding non-physical spatial distributions.
This commit is contained in:
Andrew Heather 2021-09-06 14:18:57 +01:00
parent c307c4abd2
commit 0aa44f2b9b
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -97,6 +97,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
)
),
nInjected_(this->parcelsAddedTotal()),
injectorOrder_(identity(positionAxis_.size())),
tanVec1_(),
tanVec2_()
{
@ -154,6 +155,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
thetaOuter_(im.thetaOuter_),
sizeDistribution_(im.sizeDistribution_.clone()),
nInjected_(im.nInjected_),
injectorOrder_(im.injectorOrder_),
tanVec1_(im.tanVec1_),
tanVec2_(im.tanVec2_)
{}
@ -260,8 +262,10 @@ void Foam::ConeInjection<CloudType>::setPositionAndCell
label& tetPti
)
{
const label i = parcelI % positionAxis_.size();
Random& rnd = this->owner().rndGen();
rnd.shuffle(injectorOrder_);
const label i = injectorOrder_[parcelI % positionAxis_.size()];
position = positionAxis_[i].first();
cellOwner = injectorCells_[i];
tetFacei = injectorTetFaces_[i];
@ -280,9 +284,9 @@ void Foam::ConeInjection<CloudType>::setProperties
{
Random& rnd = this->owner().rndGen();
// Set particle velocity
const label i = parcelI % positionAxis_.size();
const label i = injectorOrder_[parcelI % positionAxis_.size()];
// Set direction vectors for position i
scalar t = time - this->SOI_;
scalar ti = thetaInner_.value(t);
scalar to = thetaOuter_.value(t);
@ -297,6 +301,7 @@ void Foam::ConeInjection<CloudType>::setProperties
dirVec += normal;
dirVec.normalise();
// Set particle velocity
parcel.U() = Umag_.value(t)*dirVec;
// Set particle diameter

3
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2021-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -107,6 +108,8 @@ class ConeInjection
//- Number of parcels per injector already injected
mutable label nInjected_;
//- Order to process the injectors
labelList injectorOrder_;
// Tangential vectors to the direction vector