Skip to content
GitLab
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
c6ef6a02
Commit
c6ef6a02
authored
May 27, 2011
by
andy
Browse files
STYLE: Minor code style changes
parent
11dab784
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.C
View file @
c6ef6a02
...
...
@@ -248,7 +248,6 @@ bool Foam::TrajectoryCollision<CloudType>::collideSorted
bool
coalescence
=
false
;
vector
vRel
=
U1
-
U2
;
scalar
magVRel
=
mag
(
vRel
);
scalar
mdMin
=
m2
/
N2
;
...
...
@@ -274,7 +273,7 @@ bool Foam::TrajectoryCollision<CloudType>::collideSorted
scalar
rho
=
mTot
/
Vtot
;
scalar
dMean
=
sqrt
(
d1
*
d2
);
scalar
WeColl
=
max
(
1.0e-12
,
0
.
5
*
rho
*
mag
VRel
*
magVRel
*
dMean
/
sigma
);
scalar
WeColl
=
max
(
1.0e-12
,
0
.
5
*
rho
*
mag
Sqr
(
vRel
)
*
dMean
/
sigma
);
scalar
coalesceProb
=
min
(
1
.
0
,
2
.
4
*
f
/
WeColl
);
...
...
@@ -308,7 +307,8 @@ bool Foam::TrajectoryCollision<CloudType>::collideSorted
{
scalar
gf
=
sqrt
(
prob
)
-
sqrt
(
coalesceProb
);
scalar
denom
=
1
.
0
-
sqrt
(
coalesceProb
);
if
(
denom
<
1.0e-5
)
{
if
(
denom
<
1.0e-5
)
{
denom
=
1
.
0
;
}
gf
/=
denom
;
...
...
@@ -318,20 +318,20 @@ bool Foam::TrajectoryCollision<CloudType>::collideSorted
gf
=
max
(
0
.
0
,
gf
);
// gf -> 1 => v1p -> p1().U() ...
// gf -> 0 => v1p -> momentum/(m1
+
m2)
// gf -> 0 => v1p -> momentum/(m1
+
m2)
vector
mr
=
m1
*
U1
+
m2
*
U2
;
vector
v1p
=
(
mr
+
m2
*
gf
*
vRel
)
/
(
m1
+
m2
);
vector
v2p
=
(
mr
-
m1
*
gf
*
vRel
)
/
(
m1
+
m2
);
vector
v1p
=
(
mr
+
m2
*
gf
*
vRel
)
/
(
m1
+
m2
);
vector
v2p
=
(
mr
-
m1
*
gf
*
vRel
)
/
(
m1
+
m2
);
if
(
N1
<
N2
)
{
U1
=
v1p
;
U2
=
(
N1
*
v2p
+
(
N2
-
N1
)
*
U2
)
/
N2
;
U2
=
(
N1
*
v2p
+
(
N2
-
N1
)
*
U2
)
/
N2
;
}
else
{
U1
=
(
N2
*
v1p
+
(
N1
-
N2
)
*
U1
)
/
N1
;
U1
=
(
N2
*
v1p
+
(
N1
-
N2
)
*
U1
)
/
N1
;
U2
=
v2p
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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