Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
a0b8277f
Commit
a0b8277f
authored
May 26, 2017
by
James Willis
Browse files
Removed verbose output and added the ability to apply a random perturbation in h for each particle.
parent
f8ec2ed4
Changes
1
Hide whitespace changes
Inline
Side-by-side
tests/test27cells.c
View file @
a0b8277f
...
...
@@ -30,11 +30,8 @@
/* Local headers. */
#include
"swift.h"
#define ACC_THRESHOLD 1e-5
#if defined(WITH_VECTORIZATION)
#define DOSELF1 runner_doself1_density_vec
//#define DOPAIR1 runner_dopair1_density_vec
#define DOPAIR1 runner_dopair1_branch_density
#define DOSELF1_NAME "runner_doself1_density_vec"
#define DOPAIR1_NAME "runner_dopair1_density_vec"
...
...
@@ -74,9 +71,10 @@ enum velocity_types {
*/
struct
cell
*
make_cell
(
size_t
n
,
double
*
offset
,
double
size
,
double
h
,
double
density
,
long
long
*
partId
,
double
pert
,
enum
velocity_types
vel
)
{
enum
velocity_types
vel
,
double
h_pert
)
{
const
size_t
count
=
n
*
n
*
n
;
const
double
volume
=
size
*
size
*
size
;
float
h_max
=
0
.
f
;
struct
cell
*
cell
=
malloc
(
sizeof
(
struct
cell
));
bzero
(
cell
,
sizeof
(
struct
cell
));
...
...
@@ -122,7 +120,11 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
part
->
v
[
2
]
=
0
.
f
;
break
;
}
part
->
h
=
size
*
h
/
(
float
)
n
;
if
(
h_pert
)
part
->
h
=
size
*
h
*
random_uniform
(
1
.
f
,
1
.
1
f
)
/
(
float
)
n
;
else
part
->
h
=
size
*
h
/
(
float
)
n
;
h_max
=
fmax
(
h_max
,
part
->
h
);
part
->
id
=
++
(
*
partId
);
#if defined(GIZMO_SPH) || defined(SHADOWFAX_SPH)
...
...
@@ -157,7 +159,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
/* Cell properties */
cell
->
split
=
0
;
cell
->
h_max
=
size
*
h
/
(
float
)
n
;
cell
->
h_max
=
h_max
;
cell
->
count
=
count
;
cell
->
dx_max_part
=
0
.;
cell
->
dx_max_sort
=
0
.;
...
...
@@ -289,27 +291,6 @@ void dump_particle_fields(char *fileName, struct cell *main_cell,
fclose
(
file
);
}
/**
* @brief Compares the vectorised result against
* the serial result of the interaction.
*
* @param serial_parts Particle array that has been interacted serially
* @param vec_parts Particle array to be interacted using vectors
* @param count No. of particles that have been interacted
* @param threshold Level of accuracy needed
*
* @return Non-zero value if difference found, 0 otherwise
*/
int
check_results
(
struct
part
*
serial_parts
,
struct
part
*
vec_parts
,
int
count
,
double
threshold
)
{
int
result
=
0
;
for
(
int
i
=
0
;
i
<
count
;
i
++
)
result
+=
compare_particles
(
serial_parts
[
i
],
vec_parts
[
i
],
threshold
);
return
result
;
}
/* Just a forward declaration... */
void
runner_doself1_density
(
struct
runner
*
r
,
struct
cell
*
ci
);
void
runner_doself1_density_vec
(
struct
runner
*
r
,
struct
cell
*
ci
);
...
...
@@ -321,8 +302,7 @@ int main(int argc, char *argv[]) {
engine_pin
();
size_t
runs
=
0
,
particles
=
0
;
double
h
=
1
.
23485
,
size
=
1
.,
rho
=
1
.;
double
perturbation
=
0
.;
double
threshold
=
ACC_THRESHOLD
;
double
perturbation
=
0
.,
h_pert
=
0
.;
char
outputFileNameExtension
[
200
]
=
""
;
char
outputFileName
[
200
]
=
""
;
enum
velocity_types
vel
=
velocity_zero
;
...
...
@@ -338,11 +318,14 @@ int main(int argc, char *argv[]) {
srand
(
0
);
char
c
;
while
((
c
=
getopt
(
argc
,
argv
,
"m:s:h:n:r:t:d:f:v:
a:
"
))
!=
-
1
)
{
while
((
c
=
getopt
(
argc
,
argv
,
"m:s:h:
p:
n:r:t:d:f:v:"
))
!=
-
1
)
{
switch
(
c
)
{
case
'h'
:
sscanf
(
optarg
,
"%lf"
,
&
h
);
break
;
case
'p'
:
sscanf
(
optarg
,
"%lf"
,
&
h_pert
);
break
;
case
's'
:
sscanf
(
optarg
,
"%lf"
,
&
size
);
break
;
...
...
@@ -364,9 +347,6 @@ int main(int argc, char *argv[]) {
case
'v'
:
sscanf
(
optarg
,
"%d"
,
(
int
*
)
&
vel
);
break
;
case
'a'
:
sscanf
(
optarg
,
"%lf"
,
&
threshold
);
break
;
case
'?'
:
error
(
"Unknown option."
);
break
;
...
...
@@ -381,6 +361,7 @@ int main(int argc, char *argv[]) {
"runner_doself1_density()."
"
\n\n
Options:"
"
\n
-h DISTANCE=1.2348 - Smoothing length in units of <x>"
"
\n
-p - Random fractional change in h, h=h*random(1,p)"
"
\n
-m rho - Physical density in the cell"
"
\n
-s size - Physical size of the cell"
"
\n
-d pert - Perturbation to apply to the particles [0,1["
...
...
@@ -435,7 +416,7 @@ int main(int argc, char *argv[]) {
for
(
int
k
=
0
;
k
<
3
;
++
k
)
{
double
offset
[
3
]
=
{
i
*
size
,
j
*
size
,
k
*
size
};
cells
[
i
*
9
+
j
*
3
+
k
]
=
make_cell
(
particles
,
offset
,
size
,
h
,
rho
,
&
partId
,
perturbation
,
vel
);
&
partId
,
perturbation
,
vel
,
h_pert
);
runner_do_drift_part
(
&
runner
,
cells
[
i
*
9
+
j
*
3
+
k
],
0
);
...
...
@@ -503,10 +484,6 @@ int main(int argc, char *argv[]) {
}
}
/* Store the vectorised particle results. */
struct
part
vec_parts
[
main_cell
->
count
];
for
(
int
i
=
0
;
i
<
main_cell
->
count
;
i
++
)
vec_parts
[
i
]
=
main_cell
->
parts
[
i
];
/* Output timing */
ticks
corner_time
=
timings
[
0
]
+
timings
[
2
]
+
timings
[
6
]
+
timings
[
8
]
+
timings
[
18
]
+
timings
[
20
]
+
timings
[
24
]
+
timings
[
26
];
...
...
@@ -551,10 +528,6 @@ int main(int argc, char *argv[]) {
sprintf
(
outputFileName
,
"brute_force_27_%s.dat"
,
outputFileNameExtension
);
dump_particle_fields
(
outputFileName
,
main_cell
,
cells
);
/* Check serial results against the vectorised results. */
if
(
check_results
(
main_cell
->
parts
,
vec_parts
,
main_cell
->
count
,
threshold
))
message
(
"Differences found..."
);
/* Output timing */
message
(
"Brute force calculation took : %15lli ticks."
,
toc
-
tic
);
...
...
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