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

Renamed minParticleMass -> minParcelMass

Browse Source 
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1288
This commit is contained in:
Henry
2014-12-18 12:25:19 +00:00
parent afc467dcef
commit 402ce6c834
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
View File

@ -105,8 +105,8 @@ public:
//- Particle density [kg/m3] (constant) //- Particle density [kg/m3] (constant)
demandDrivenEntry<scalar> rho0_; demandDrivenEntry<scalar> rho0_;
//- Minimum particle mass [kg] //- Minimum parcel mass [kg]
demandDrivenEntry<scalar> minParticleMass_; demandDrivenEntry<scalar> minParcelMass_;
public: public:
@ -138,7 +138,7 @@ public:
inline scalar rho0() const; inline scalar rho0() const;
//- Return const access to the minimum particle mass //- Return const access to the minimum particle mass
inline scalar minParticleMass() const; inline scalar minParcelMass() const;
}; };

12
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -37,7 +37,7 @@ Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties()
parcelTypeId_(dict_, -1), parcelTypeId_(dict_, -1),
rhoMin_(dict_, 0.0), rhoMin_(dict_, 0.0),
rho0_(dict_, 0.0), rho0_(dict_, 0.0),
minParticleMass_(dict_, 0.0) minParcelMass_(dict_, 0.0)
{} {}
@ -51,7 +51,7 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
parcelTypeId_(cp.parcelTypeId_), parcelTypeId_(cp.parcelTypeId_),
rhoMin_(cp.rhoMin_), rhoMin_(cp.rhoMin_),
rho0_(cp.rho0_), rho0_(cp.rho0_),
minParticleMass_(cp.minParticleMass_) minParcelMass_(cp.minParcelMass_)
{} {}
@ -65,7 +65,7 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
parcelTypeId_(dict_, "parcelTypeId", -1), parcelTypeId_(dict_, "parcelTypeId", -1),
rhoMin_(dict_, "rhoMin", 1e-15), rhoMin_(dict_, "rhoMin", 1e-15),
rho0_(dict_, "rho0"), rho0_(dict_, "rho0"),
minParticleMass_(dict_, "minParticleMass", 1e-15) minParcelMass_(dict_, "minParcelMass", 1e-15)
{} {}
@ -165,9 +165,9 @@ Foam::KinematicParcel<ParcelType>::constantProperties::rho0() const
template<class ParcelType> template<class ParcelType>
inline Foam::scalar inline Foam::scalar
Foam::KinematicParcel<ParcelType>::constantProperties::minParticleMass() const Foam::KinematicParcel<ParcelType>::constantProperties::minParcelMass() const
{ {
return minParticleMass_.value(); return minParcelMass_.value();
} }

4
src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -341,7 +341,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
} }
// Remove the particle when mass falls below minimum threshold // Remove the particle when mass falls below minimum threshold
if (np0*mass1 < td.cloud().constProps().minParticleMass()) if (np0*mass1 < td.cloud().constProps().minParcelMass())
{ {
td.keepParticle = false; td.keepParticle = false;

2
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
View File

@ -514,7 +514,7 @@ void Foam::ReactingParcel<ParcelType>::calc
} }
// Remove the particle when mass falls below minimum threshold // Remove the particle when mass falls below minimum threshold
if (np0*mass1 < td.cloud().constProps().minParticleMass()) if (np0*mass1 < td.cloud().constProps().minParcelMass())
{ {
td.keepParticle = false; td.keepParticle = false;

4
src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -95,7 +95,7 @@ public:
const label parcelTypeId, const label parcelTypeId,
const scalar rhoMin, const scalar rhoMin,
const scalar rho0, const scalar rho0,
const scalar minParticleMass, const scalar minParcelMass,
const scalar youngsModulus, const scalar youngsModulus,
const scalar poissonsRatio, const scalar poissonsRatio,
const scalar T0, const scalar T0,

6
src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -64,7 +64,7 @@ inline Foam::SprayParcel<ParcelType>::constantProperties::constantProperties
const label parcelTypeId, const label parcelTypeId,
const scalar rhoMin, const scalar rhoMin,
const scalar rho0, const scalar rho0,
const scalar minParticleMass, const scalar minParcelMass,
const scalar youngsModulus, const scalar youngsModulus,
const scalar poissonsRatio, const scalar poissonsRatio,
const scalar T0, const scalar T0,
@ -85,7 +85,7 @@ inline Foam::SprayParcel<ParcelType>::constantProperties::constantProperties
parcelTypeId, parcelTypeId,
rhoMin, rhoMin,
rho0, rho0,
minParticleMass, minParcelMass,
youngsModulus, youngsModulus,
poissonsRatio, poissonsRatio,
T0, T0,

4
src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.C
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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -84,7 +84,7 @@ void Foam::ORourkeCollision<CloudType>::collide(const scalar dt)
parcelType& p = iter(); parcelType& p = iter();
scalar mass = p.nParticle()*p.mass(); scalar mass = p.nParticle()*p.mass();
if (mass < this->owner().constProps().minParticleMass()) if (mass < this->owner().constProps().minParcelMass())
{ {
this->owner().deleteParticle(p); this->owner().deleteParticle(p);
} }

2
tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
View File

@ -48,7 +48,7 @@ constantProperties
parcelTypeId 1; parcelTypeId 1;
rhoMin 1e-15; rhoMin 1e-15;
minParticleMass 1e-15; minParcelMass 1e-15;
rho0 2526; rho0 2526;
youngsModulus 1e8; youngsModulus 1e8;