zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: splash model - correction and code refactoring

Browse Source
This commit is contained in:
Andrew Heather
2023-03-16 09:01:33 +00:00
parent 424f913fdd
commit 35c2b4b603
3 changed files with 56 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,49 +37,16 @@ using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
template<class CloudType> template<class CloudType>
Foam::wordList Foam::KinematicSurfaceFilm<CloudType>::interactionTypeNames_ const Foam::Enum
({ <
"absorb", "bounce", "splashBai"
});
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
template<class CloudType>
typename Foam::KinematicSurfaceFilm<CloudType>::interactionType typename Foam::KinematicSurfaceFilm<CloudType>::interactionType
Foam::KinematicSurfaceFilm<CloudType>::interactionTypeEnum(const word& it) const >
{ Foam::KinematicSurfaceFilm<CloudType>::interactionTypeNames
forAll(interactionTypeNames_, i) ({
{ { interactionType::absorb, "absorb" },
if (interactionTypeNames_[i] == it) { interactionType::bounce, "bounce" },
{ { interactionType::splashBai, "splashBai" },
return interactionType(i); });
}
}
FatalErrorInFunction
<< "Unknown interaction type " << it
<< ". Valid interaction types include: " << interactionTypeNames_
<< abort(FatalError);
return interactionType(0);
}
template<class CloudType>
Foam::word Foam::KinematicSurfaceFilm<CloudType>::interactionTypeStr
(
const interactionType& it
) const
{
if (it >= interactionTypeNames_.size())
{
FatalErrorInFunction
<< "Unknown interaction type enumeration" << abort(FatalError);
}
return interactionTypeNames_[it];
}
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@ -415,8 +382,8 @@ void Foam::KinematicSurfaceFilm<CloudType>::splashInteraction
const scalar dBarSplash = 1/cbrt(6.0)*cbrt(mRatio/Ns)*d + ROOTVSMALL; const scalar dBarSplash = 1/cbrt(6.0)*cbrt(mRatio/Ns)*d + ROOTVSMALL;
// Cumulative diameter splash distribution // Cumulative diameter splash distribution
const scalar dMax = 0.9*cbrt(mRatio)*d; const scalar dMax = dMaxSplash_ > 0 ? dMaxSplash_ : 0.9*cbrt(mRatio)*d;
const scalar dMin = 0.1*dMax; const scalar dMin = dMinSplash_ > 0 ? dMinSplash_ : 0.1*dMax;
const scalar K = exp(-dMin/dBarSplash) - exp(-dMax/dBarSplash); const scalar K = exp(-dMin/dBarSplash) - exp(-dMax/dBarSplash);
// Surface energy of secondary parcels [J] // Surface energy of secondary parcels [J]
@ -457,7 +424,9 @@ void Foam::KinematicSurfaceFilm<CloudType>::splashInteraction
const scalar logD = log(d); const scalar logD = log(d);
const scalar coeff2 = log(dNew[0]) - logD + ROOTVSMALL; const scalar coeff2 = log(dNew[0]) - logD + ROOTVSMALL;
scalar coeff1 = 0.0; scalar coeff1 = 0.0;
forAll(dNew, i)
// Note: loop from i = 1 to (p-1)
for (int i = 1; i < parcelsPerSplash_; ++i)
{ {
coeff1 += sqr(log(dNew[i]) - logD); coeff1 += sqr(log(dNew[i]) - logD);
} }
@ -527,27 +496,32 @@ Foam::KinematicSurfaceFilm<CloudType>::KinematicSurfaceFilm
areaFilms_(), areaFilms_(),
interactionType_ interactionType_
( (
interactionTypeEnum(this->coeffDict().getWord("interactionType")) interactionTypeNames.get("interactionType", this->coeffDict())
), ),
parcelTypes_(this->coeffDict().getOrDefault("parcelTypes", labelList())), parcelTypes_(this->coeffDict().getOrDefault("parcelTypes", labelList())),
deltaWet_(0.0), deltaWet_(Zero),
splashParcelType_(0), splashParcelType_(0),
parcelsPerSplash_(0), parcelsPerSplash_(0),
Adry_(0.0), dMaxSplash_(-1),
Awet_(0.0), dMinSplash_(-1),
Cf_(0.0), Adry_(Zero),
Awet_(Zero),
Cf_(Zero),
nParcelsSplashed_(0) nParcelsSplashed_(0)
{ {
Info<< " Applying " << interactionTypeStr(interactionType_) Info<< " Applying " << interactionTypeNames[interactionType_]
<< " interaction model" << endl; << " interaction model" << endl;
if (interactionType_ == itSplashBai) if (interactionType_ == interactionType::splashBai)
{ {
this->coeffDict().readEntry("deltaWet", deltaWet_); this->coeffDict().readEntry("deltaWet", deltaWet_);
splashParcelType_ = splashParcelType_ =
this->coeffDict().getOrDefault("splashParcelType", -1); this->coeffDict().getOrDefault("splashParcelType", -1);
parcelsPerSplash_ = parcelsPerSplash_ =
this->coeffDict().getOrDefault("parcelsPerSplash", 2); this->coeffDict().getOrDefault("parcelsPerSplash", 2);
dMinSplash_ = this->coeffDict().getOrDefault("dMinSplash", -1);
dMaxSplash_ = this->coeffDict().getOrDefault("dMaxSplash", -1);
this->coeffDict().readEntry("Adry", Adry_); this->coeffDict().readEntry("Adry", Adry_);
this->coeffDict().readEntry("Awet", Awet_); this->coeffDict().readEntry("Awet", Awet_);
this->coeffDict().readEntry("Cf", Cf_); this->coeffDict().readEntry("Cf", Cf_);
@ -573,12 +547,14 @@ Foam::KinematicSurfaceFilm<CloudType>::KinematicSurfaceFilm
deltaWet_(sfm.deltaWet_), deltaWet_(sfm.deltaWet_),
splashParcelType_(sfm.splashParcelType_), splashParcelType_(sfm.splashParcelType_),
parcelsPerSplash_(sfm.parcelsPerSplash_), parcelsPerSplash_(sfm.parcelsPerSplash_),
dMaxSplash_(sfm.dMaxSplash_),
dMinSplash_(sfm.dMinSplash_),
Adry_(sfm.Adry_), Adry_(sfm.Adry_),
Awet_(sfm.Awet_), Awet_(sfm.Awet_),
Cf_(sfm.Cf_), Cf_(sfm.Cf_),
nParcelsSplashed_(sfm.nParcelsSplashed_) nParcelsSplashed_(sfm.nParcelsSplashed_)
{ {
if (interactionType_ == itSplashBai) if (interactionType_ == interactionType::splashBai)
{ {
init(initThermo); init(initThermo);
} }
@ -620,14 +596,14 @@ bool Foam::KinematicSurfaceFilm<CloudType>::transferParcel
switch (interactionType_) switch (interactionType_)
{ {
case itBounce: case interactionType::bounce:
{ {
bounceInteraction(p, pp, facei, keepParticle); bounceInteraction(p, pp, facei, keepParticle);
break; break;
} }
case itAbsorb: case interactionType::absorb:
{ {
const scalar m = p.nParticle()*p.mass(); const scalar m = p.nParticle()*p.mass();
@ -637,7 +613,7 @@ bool Foam::KinematicSurfaceFilm<CloudType>::transferParcel
break; break;
} }
case itSplashBai: case interactionType::splashBai:
{ {
const scalarField X(thermo_->size(), 1); const scalarField X(thermo_->size(), 1);
const scalar mu = thermo_->mu(pRef_, TRef_, X); const scalar mu = thermo_->mu(pRef_, TRef_, X);
@ -693,14 +669,14 @@ bool Foam::KinematicSurfaceFilm<CloudType>::transferParcel
switch (interactionType_) switch (interactionType_)
{ {
case itBounce: case interactionType::bounce:
{ {
bounceInteraction(p, pp, facei, keepParticle); bounceInteraction(p, pp, facei, keepParticle);
break; break;
} }
case itAbsorb: case interactionType::absorb:
{ {
const scalar m = p.nParticle()*p.mass(); const scalar m = p.nParticle()*p.mass();
@ -711,7 +687,7 @@ bool Foam::KinematicSurfaceFilm<CloudType>::transferParcel
break; break;
} }
case itSplashBai: case interactionType::splashBai:
{ {
auto& liqFilm = auto& liqFilm =
refCast refCast
@ -725,13 +701,9 @@ bool Foam::KinematicSurfaceFilm<CloudType>::transferParcel
const scalar TRef = liqFilm.Tref(); const scalar TRef = liqFilm.Tref();
const scalar mu = liqFilm.thermo().mu(pRef, TRef, X); const scalar mu = liqFilm.thermo().mu(pRef, TRef, X);
const scalar sigma = const scalar sigma = liqFilm.thermo().sigma(pRef, TRef, X);
liqFilm.thermo().sigma(pRef, TRef, X);
const bool dry const bool dry = film.h()[filmFacei] < this->deltaWet_;
(
film.h()[filmFacei] < this->deltaWet_
);
if (dry) if (dry)
{ {

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

@ -33,7 +33,7 @@ Description
Kinematic parcel surface film model. Kinematic parcel surface film model.
Responsible for: Responsible for:
- injecting parcelss from the film model into the cloud, e.g. for dripping - injecting parcels from the film model into the cloud, e.g. for dripping
- parcel interaction with the film, e.g absorb, bounce, splash - parcel interaction with the film, e.g absorb, bounce, splash
SourceFiles SourceFiles
@ -48,6 +48,7 @@ SourceFiles
#include "SurfaceFilmModel.H" #include "SurfaceFilmModel.H"
#include "UPtrList.H" #include "UPtrList.H"
#include "liquidMixtureProperties.H" #include "liquidMixtureProperties.H"
#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -81,24 +82,15 @@ public:
// Public Data // Public Data
//- Options for the interaction types //- Options for the interaction types
enum interactionType enum class interactionType
{ {
itAbsorb, //!< "absorb" absorb, //!< absorb
itBounce, //!< "bounce" bounce, //!< bounce
itSplashBai //!< "splashBai" splashBai //!< Bai splash model
}; };
//- Names for interactionType //- Names for interactionType
static wordList interactionTypeNames_; static const Enum<interactionType> interactionTypeNames;
// Public Member Functions
//- Return interaction type enum from word
interactionType interactionTypeEnum(const word& it) const;
//- Return word from interaction type enum
word interactionTypeStr(const interactionType& it) const;
protected: protected:
@ -162,6 +154,13 @@ protected:
//- Number of new parcels resulting from splash event //- Number of new parcels resulting from splash event
label parcelsPerSplash_; label parcelsPerSplash_;
//- Maximum splash particle diameter for Chi-square distribution
// Default is incident particle diameter
scalar dMaxSplash_;
//- Minimum splash particle diameter for Chi-square distribution
// Default is 0.1 dMaxSplash
scalar dMinSplash_;
// Surface roughness coefficient typically in the range 1300 - 5200 // Surface roughness coefficient typically in the range 1300 - 5200
// and decreases with increasing surface roughness // and decreases with increasing surface roughness

12
src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
View File

@ -83,14 +83,14 @@ bool Foam::ThermoSurfaceFilm<CloudType>::transferParcel
switch (this->interactionType_) switch (this->interactionType_)
{ {
case KinematicSurfaceFilm<CloudType>::itBounce: case KinematicSurfaceFilm<CloudType>::interactionType::bounce:
{ {
this->bounceInteraction(p, pp, facei, keepParticle); this->bounceInteraction(p, pp, facei, keepParticle);
break; break;
} }
case KinematicSurfaceFilm<CloudType>::itAbsorb: case KinematicSurfaceFilm<CloudType>::interactionType::absorb:
{ {
const scalar m = p.nParticle()*p.mass(); const scalar m = p.nParticle()*p.mass();
@ -100,7 +100,7 @@ bool Foam::ThermoSurfaceFilm<CloudType>::transferParcel
break; break;
} }
case KinematicSurfaceFilm<CloudType>::itSplashBai: case KinematicSurfaceFilm<CloudType>::interactionType::splashBai:
{ {
// Local pressure // Local pressure
const scalar pc = thermo_.thermo().p()[p.cell()]; const scalar pc = thermo_.thermo().p()[p.cell()];
@ -158,14 +158,14 @@ bool Foam::ThermoSurfaceFilm<CloudType>::transferParcel
switch (this->interactionType_) switch (this->interactionType_)
{ {
case KinematicSurfaceFilm<CloudType>::itBounce: case KinematicSurfaceFilm<CloudType>::interactionType::bounce:
{ {
this->bounceInteraction(p, pp, facei, keepParticle); this->bounceInteraction(p, pp, facei, keepParticle);
break; break;
} }
case KinematicSurfaceFilm<CloudType>::itAbsorb: case KinematicSurfaceFilm<CloudType>::interactionType::absorb:
{ {
const scalar m = p.nParticle()*p.mass(); const scalar m = p.nParticle()*p.mass();
@ -176,7 +176,7 @@ bool Foam::ThermoSurfaceFilm<CloudType>::transferParcel
break; break;
} }
case KinematicSurfaceFilm<CloudType>::itSplashBai: case KinematicSurfaceFilm<CloudType>::interactionType::splashBai:
{ {
// Local pressure // Local pressure
const scalar pc = thermo_.thermo().p()[p.cell()]; const scalar pc = thermo_.thermo().p()[p.cell()];