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

Merge branch 'feature-conditional-absorption-kinematic-film' into 'develop'

Browse Source 
ENH: KinematicSurfaceFilm: add option to specify interacting parcel types

See merge request Development/openfoam!581
This commit is contained in:
Andrew Heather 2022-12-01 12:52:05 +00:00
commit e60d0997e6
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/KinematicSurfaceFilm/KinematicSurfaceFilm.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2021 OpenCFD Ltd.
Copyright (C) 2021-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -541,6 +541,7 @@ Foam::KinematicSurfaceFilm<CloudType>::KinematicSurfaceFilm
(
interactionTypeEnum(this->coeffDict().getWord("interactionType"))
),
parcelTypes_(this->coeffDict().getOrDefault("parcelTypes", labelList())),
deltaWet_(0.0),
splashParcelType_(0),
parcelsPerSplash_(0),
@ -580,6 +581,7 @@ Foam::KinematicSurfaceFilm<CloudType>::KinematicSurfaceFilm
filmModel_(nullptr),
areaFilms_(),
interactionType_(sfm.interactionType_),
parcelTypes_(sfm.parcelTypes_),
deltaWet_(sfm.deltaWet_),
splashParcelType_(sfm.splashParcelType_),
parcelsPerSplash_(sfm.parcelsPerSplash_),
@ -605,6 +607,18 @@ bool Foam::KinematicSurfaceFilm<CloudType>::transferParcel
bool& keepParticle
)
{
if (parcelTypes_.size() && parcelTypes_.find(p.typeId()) == -1)
{
if (debug)
{
Pout<< "transferParcel: ignoring particle with typeId="
<< p.typeId()
<< endl;
}
return false;
}
const label patchi = pp.index();
const label meshFacei = p.face();
const label facei = pp.whichFace(meshFacei);

4
src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/KinematicSurfaceFilm/KinematicSurfaceFilm.H
View File

@ -147,6 +147,10 @@ protected:
//- Interaction type enumeration
interactionType interactionType_;
//- Particle type IDs that can interact with the film
// If empty (default) all type IDs are included
labelList parcelTypes_;
//- Film thickness beyond which patch is assumed to be wet
scalar deltaWet_;