Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dg
dg
Commits
d4670647
Commit
d4670647
authored
Jan 25, 2017
by
Jonathan Lambrechts
Browse files
fix number of particle seeding by element roundings
parent
a947408e
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/slimParticles/dgParticleTracker2D.cpp
View file @
d4670647
...
...
@@ -1113,7 +1113,10 @@ void particleArray::addParticlesWithDofContainer(dgGroupCollection* groups, dgDo
fullMatrix
<
double
>
ecoord
;
groupOfElements
->
elementCoordinatesProxy
(
elementId
,
ecoord
);
double
elSurface
=
groupOfElements
->
getFunctionSpace
().
volume
(
ecoord
);
int
nbParticlesInElem
=
static_cast
<
int
>
((
concentration
/
1000000.0
)
*
elSurface
+
0.5
);
//static_cast rounds down
double
nbParticlesInElemDouble
=
(
concentration
/
1000000.0
)
*
elSurface
;
int
nbParticlesInElem
=
static_cast
<
int
>
(
nbParticlesInElemDouble
);
//static_cast rounds down
if
(
rand
()
*
1.
/
RAND_MAX
<
(
nbParticlesInElemDouble
-
nbParticlesInElem
))
nbParticlesInElem
+=
1
;
if
(
nbParticlesInElem
!=
0
)
{
//If reef does not have enough particles for minNbParticlesPerHabitat, add however many needed on this element
if
(
particlesMissing
[
habitatId
]
>
0
)
{
...
...
@@ -1129,7 +1132,7 @@ void particleArray::addParticlesWithDofContainer(dgGroupCollection* groups, dgDo
//Now seed particles
for
(
int
j
=
0
;
j
<
nbParticlesInElem
;
j
++
)
{
//
if (j==0) printf("Number of particles in reef element %d (habitatId %d) is %d\n",nbOfHabitatElements, habitatId, nbParticlesInElem );
if
(
j
==
0
)
printf
(
"Number of particles in reef element %d (habitatId %d) is %d
\n
"
,
nbOfHabitatElements
,
habitatId
,
nbParticlesInElem
);
double
u
=
rand
()
*
1.
/
RAND_MAX
;
double
v
=
rand
()
*
1.
/
RAND_MAX
;
if
(
u
+
v
>
1
){
...
...
@@ -1285,6 +1288,7 @@ void particleArray::addParticlesWithReefMap(dgGroupCollection* groups, dgDofCont
if
(
reefId
>
nbOfShallowReefs
&&
seedOverWhichReefs
==
0
)
continue
;
if
(
reefId
<=
nbOfShallowReefs
&&
seedOverWhichReefs
==
1
)
continue
;
//Seed element in parametric space:
//First calc. no. of particles to seed in element, and count reef as having been seeded
fullMatrix
<
double
>
ecoord
;
...
...
Write
Preview
Markdown
is supported
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