Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
b7f24bc3
Commit
b7f24bc3
authored
9 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Added function for brute-force pair
parent
b292bc22
No related branches found
No related tags found
1 merge request
!64
Agreed upon version of the density vectorization test
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/tools.c
+10
-0
10 additions, 0 deletions
src/tools.c
tests/testVectorize.c
+46
-10
46 additions, 10 deletions
tests/testVectorize.c
with
56 additions
and
10 deletions
src/tools.c
+
10
−
0
View file @
b7f24bc3
...
...
@@ -180,6 +180,16 @@ void pairs_single_density(double *dim, long long int pid,
fflush
(
stdout
);
}
void
pairs_all_density
(
struct
runner
*
r
,
struct
cell
*
ci
,
struct
cell
*
cj
)
{
}
void
pairs_single_grav
(
double
*
dim
,
long
long
int
pid
,
struct
gpart
*
__restrict__
parts
,
int
N
,
int
periodic
)
{
...
...
This diff is collapsed.
Click to expand it.
tests/testVectorize.c
+
46
−
10
View file @
b7f24bc3
...
...
@@ -50,7 +50,26 @@ struct cell *make_cell(size_t n, double *offset, double h,
return
cell
;
}
/**
* @brief Initializes all particles field to be ready for a density calculation
*/
void
zero_particle_fields
(
struct
cell
*
c
)
{
for
(
size_t
pid
=
0
;
pid
<
c
->
count
;
pid
++
)
{
c
->
parts
[
pid
].
rho
=
0
.
f
;
c
->
parts
[
pid
].
rho_dh
=
0
.
f
;
c
->
parts
[
pid
].
density
.
wcount
=
0
.
f
;
c
->
parts
[
pid
].
density
.
wcount_dh
=
0
.
f
;
c
->
parts
[
pid
].
density
.
div_v
=
0
.
f
;
c
->
parts
[
pid
].
density
.
curl_v
[
0
]
=
0
.
f
;
c
->
parts
[
pid
].
density
.
curl_v
[
1
]
=
0
.
f
;
c
->
parts
[
pid
].
density
.
curl_v
[
2
]
=
0
.
f
;
}
}
/* Just forward declarations... */
void
runner_dopair1_density
(
struct
runner
*
r
,
struct
cell
*
ci
,
struct
cell
*
cj
);
void
pairs_all_density
(
struct
runner
*
r
,
struct
cell
*
ci
,
struct
cell
*
cj
);
int
main
(
int
argc
,
char
*
argv
[])
{
size_t
particles
=
0
,
runs
=
0
,
volume
,
type
=
0
;
...
...
@@ -86,7 +105,7 @@ int main(int argc, char *argv[]) {
"
\n
These are then interacted using runner_dopair1_density."
"
\n\n
Options:"
"
\n
-t TYPE=0 - cells share face (0), edge (1) or corner (2)"
"
\n
-h DISTANCE=1.1255 - smoothing length"
,
"
\n
-h DISTANCE=1.1255 - smoothing length
\n
"
,
argv
[
0
]);
exit
(
1
);
}
...
...
@@ -108,10 +127,19 @@ int main(int argc, char *argv[]) {
runner
.
e
=
&
engine
;
printf
(
"#ID, rho, rho_dh,
density.wcount, density.
wcount_dh, div_v, "
"#
ID, rho, rho_dh,
wcount,
wcount_dh, div_v, "
"curl_v:[x,y,z]
\n
"
);
for
(
size_t
i
=
0
;
i
<
runs
;
++
i
)
{
/* Zero the fields */
zero_particle_fields
(
ci
);
zero_particle_fields
(
cj
);
/* Run the test */
runner_dopair1_density
(
&
runner
,
ci
,
cj
);
/* Dump if necessary */
if
(
i
%
50
==
0
)
{
for
(
size_t
pid
=
0
;
pid
<
ci
->
count
;
pid
++
)
{
printf
(
"%llu,%f,%f,%f,%f,%f,[%f,%f,%f]
\n
"
,
ci
->
parts
[
pid
].
id
,
...
...
@@ -121,15 +149,23 @@ int main(int argc, char *argv[]) {
ci
->
parts
[
pid
].
density
.
curl_v
[
1
],
ci
->
parts
[
pid
].
density
.
curl_v
[
2
]);
}
for
(
size_t
p
i
d
=
0
;
p
i
d
<
cj
->
count
;
p
i
d
++
)
{
printf
(
"%llu,%f,%f,%f,%f,%f,[%f,%f,%f]
\n
"
,
cj
->
parts
[
p
i
d
].
id
,
cj
->
parts
[
p
i
d
].
rho
,
cj
->
parts
[
p
i
d
].
rho_dh
,
cj
->
parts
[
p
i
d
].
density
.
wcount
,
cj
->
parts
[
p
i
d
].
density
.
wcount_dh
,
cj
->
parts
[
p
i
d
].
density
.
div_v
,
cj
->
parts
[
p
i
d
].
density
.
curl_v
[
0
],
cj
->
parts
[
p
i
d
].
density
.
curl_v
[
1
],
cj
->
parts
[
p
i
d
].
density
.
curl_v
[
2
]);
for
(
size_t
p
j
d
=
0
;
p
j
d
<
cj
->
count
;
p
j
d
++
)
{
printf
(
"%llu,%f,%f,%f,%f,%f,[%f,%f,%f]
\n
"
,
cj
->
parts
[
p
j
d
].
id
,
cj
->
parts
[
p
j
d
].
rho
,
cj
->
parts
[
p
j
d
].
rho_dh
,
cj
->
parts
[
p
j
d
].
density
.
wcount
,
cj
->
parts
[
p
j
d
].
density
.
wcount_dh
,
cj
->
parts
[
p
j
d
].
density
.
div_v
,
cj
->
parts
[
p
j
d
].
density
.
curl_v
[
0
],
cj
->
parts
[
p
j
d
].
density
.
curl_v
[
1
],
cj
->
parts
[
p
j
d
].
density
.
curl_v
[
2
]);
}
}
runner_dopair1_density
(
&
runner
,
ci
,
cj
);
}
/* Now perform a brute-force version for accuracy tests */
zero_particle_fields
(
ci
);
zero_particle_fields
(
cj
);
pairs_all_density
(
&
runner
,
ci
,
cj
);
return
0
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment