Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
402ce6c8
Commit
402ce6c8
authored
Dec 18, 2014
by
Henry
Browse files
Renamed minParticleMass -> minParcelMass
Resolves bug-report
http://www.openfoam.org/mantisbt/view.php?id=1288
parent
afc467dc
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
View file @
402ce6c8
...
...
@@ -105,8 +105,8 @@ public:
//- Particle density [kg/m3] (constant)
demandDrivenEntry
<
scalar
>
rho0_
;
//- Minimum par
ticle
mass [kg]
demandDrivenEntry
<
scalar
>
minPar
ticle
Mass_
;
//- Minimum par
cel
mass [kg]
demandDrivenEntry
<
scalar
>
minPar
cel
Mass_
;
public:
...
...
@@ -138,7 +138,7 @@ public:
inline
scalar
rho0
()
const
;
//- Return const access to the minimum particle mass
inline
scalar
minPar
ticle
Mass
()
const
;
inline
scalar
minPar
cel
Mass
()
const
;
};
...
...
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
View file @
402ce6c8
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
3
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
4
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -37,7 +37,7 @@ Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties()
parcelTypeId_
(
dict_
,
-
1
),
rhoMin_
(
dict_
,
0.0
),
rho0_
(
dict_
,
0.0
),
minPar
ticle
Mass_
(
dict_
,
0.0
)
minPar
cel
Mass_
(
dict_
,
0.0
)
{}
...
...
@@ -51,7 +51,7 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
parcelTypeId_
(
cp
.
parcelTypeId_
),
rhoMin_
(
cp
.
rhoMin_
),
rho0_
(
cp
.
rho0_
),
minPar
ticle
Mass_
(
cp
.
minPar
ticle
Mass_
)
minPar
cel
Mass_
(
cp
.
minPar
cel
Mass_
)
{}
...
...
@@ -65,7 +65,7 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
parcelTypeId_
(
dict_
,
"parcelTypeId"
,
-
1
),
rhoMin_
(
dict_
,
"rhoMin"
,
1e-15
),
rho0_
(
dict_
,
"rho0"
),
minPar
ticle
Mass_
(
dict_
,
"minPar
ticle
Mass"
,
1e-15
)
minPar
cel
Mass_
(
dict_
,
"minPar
cel
Mass"
,
1e-15
)
{}
...
...
@@ -165,9 +165,9 @@ Foam::KinematicParcel<ParcelType>::constantProperties::rho0() const
template
<
class
ParcelType
>
inline
Foam
::
scalar
Foam
::
KinematicParcel
<
ParcelType
>::
constantProperties
::
minPar
ticle
Mass
()
const
Foam
::
KinematicParcel
<
ParcelType
>::
constantProperties
::
minPar
cel
Mass
()
const
{
return
minPar
ticle
Mass_
.
value
();
return
minPar
cel
Mass_
.
value
();
}
...
...
src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
View file @
402ce6c8
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
3
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
4
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -341,7 +341,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
}
// Remove the particle when mass falls below minimum threshold
if
(
np0
*
mass1
<
td
.
cloud
().
constProps
().
minPar
ticle
Mass
())
if
(
np0
*
mass1
<
td
.
cloud
().
constProps
().
minPar
cel
Mass
())
{
td
.
keepParticle
=
false
;
...
...
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
View file @
402ce6c8
...
...
@@ -514,7 +514,7 @@ void Foam::ReactingParcel<ParcelType>::calc
}
// Remove the particle when mass falls below minimum threshold
if
(
np0
*
mass1
<
td
.
cloud
().
constProps
().
minPar
ticle
Mass
())
if
(
np0
*
mass1
<
td
.
cloud
().
constProps
().
minPar
cel
Mass
())
{
td
.
keepParticle
=
false
;
...
...
src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
View file @
402ce6c8
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
3
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
4
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -95,7 +95,7 @@ public:
const
label
parcelTypeId
,
const
scalar
rhoMin
,
const
scalar
rho0
,
const
scalar
minPar
ticle
Mass
,
const
scalar
minPar
cel
Mass
,
const
scalar
youngsModulus
,
const
scalar
poissonsRatio
,
const
scalar
T0
,
...
...
src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H
View file @
402ce6c8
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
3
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
4
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -64,7 +64,7 @@ inline Foam::SprayParcel<ParcelType>::constantProperties::constantProperties
const
label
parcelTypeId
,
const
scalar
rhoMin
,
const
scalar
rho0
,
const
scalar
minPar
ticle
Mass
,
const
scalar
minPar
cel
Mass
,
const
scalar
youngsModulus
,
const
scalar
poissonsRatio
,
const
scalar
T0
,
...
...
@@ -85,7 +85,7 @@ inline Foam::SprayParcel<ParcelType>::constantProperties::constantProperties
parcelTypeId
,
rhoMin
,
rho0
,
minPar
ticle
Mass
,
minPar
cel
Mass
,
youngsModulus
,
poissonsRatio
,
T0
,
...
...
src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.C
View file @
402ce6c8
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
3
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
4
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -84,7 +84,7 @@ void Foam::ORourkeCollision<CloudType>::collide(const scalar dt)
parcelType
&
p
=
iter
();
scalar
mass
=
p
.
nParticle
()
*
p
.
mass
();
if
(
mass
<
this
->
owner
().
constProps
().
minPar
ticle
Mass
())
if
(
mass
<
this
->
owner
().
constProps
().
minPar
cel
Mass
())
{
this
->
owner
().
deleteParticle
(
p
);
}
...
...
tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
View file @
402ce6c8
...
...
@@ -48,7 +48,7 @@ constantProperties
parcelTypeId 1;
rhoMin 1e-15;
minPar
ticle
Mass 1e-15;
minPar
cel
Mass
1e-15;
rho0 2526;
youngsModulus 1e8;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment