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
0c94b5ac
Commit
0c94b5ac
authored
12 years ago
by
Pedro Gonnet
Browse files
Options
Downloads
Patches
Plain Diff
several minor changes.
Former-commit-id: ff0453a795690a038cb5c529e87a5ecd25434c0c
parent
0488643b
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/engine.c
+5
-11
5 additions, 11 deletions
src/engine.c
src/kernel.h
+1
-0
1 addition, 0 deletions
src/kernel.h
src/runner_iact.h
+32
-36
32 additions, 36 deletions
src/runner_iact.h
src/space.h
+1
-1
1 addition, 1 deletion
src/space.h
with
39 additions
and
48 deletions
src/engine.c
+
5
−
11
View file @
0c94b5ac
...
@@ -431,8 +431,8 @@ void engine_single_force ( double *dim , long long int pid , struct part *__rest
...
@@ -431,8 +431,8 @@ void engine_single_force ( double *dim , long long int pid , struct part *__rest
p
.
force
.
u_dt
=
0
.
0
f
;
p
.
force
.
h_dt
=
0
.
0
f
;
p
.
force
.
v_sig
=
0
.
0
f
;
p
.
force
.
u_dt
=
0
.
0
f
;
p
.
force
.
h_dt
=
0
.
0
f
;
p
.
force
.
v_sig
=
0
.
0
f
;
/* Loop over all particle pairs (force). */
/* Loop over all particle pairs (force). */
//
for ( k = 0 ; k < N ; k++ ) {
for
(
k
=
0
;
k
<
N
;
k
++
)
{
for
(
k
=
N
-
1
;
k
>=
0
;
k
--
)
{
//
for ( k = N-1 ; k >= 0 ; k-- ) {
if
(
parts
[
k
].
id
==
p
.
id
)
if
(
parts
[
k
].
id
==
p
.
id
)
continue
;
continue
;
for
(
i
=
0
;
i
<
3
;
i
++
)
{
for
(
i
=
0
;
i
<
3
;
i
++
)
{
...
@@ -447,13 +447,7 @@ void engine_single_force ( double *dim , long long int pid , struct part *__rest
...
@@ -447,13 +447,7 @@ void engine_single_force ( double *dim , long long int pid , struct part *__rest
}
}
r2
=
fdx
[
0
]
*
fdx
[
0
]
+
fdx
[
1
]
*
fdx
[
1
]
+
fdx
[
2
]
*
fdx
[
2
];
r2
=
fdx
[
0
]
*
fdx
[
0
]
+
fdx
[
1
]
*
fdx
[
1
]
+
fdx
[
2
]
*
fdx
[
2
];
if
(
r2
<
p
.
h
*
p
.
h
*
kernel_gamma2
||
r2
<
parts
[
k
].
h
*
parts
[
k
].
h
*
kernel_gamma2
)
{
if
(
r2
<
p
.
h
*
p
.
h
*
kernel_gamma2
||
r2
<
parts
[
k
].
h
*
parts
[
k
].
h
*
kernel_gamma2
)
{
p
.
a
[
0
]
=
0
.
0
f
;
p
.
a
[
1
]
=
0
.
0
f
;
p
.
a
[
2
]
=
0
.
0
f
;
p
.
force
.
u_dt
=
0
.
0
f
;
p
.
force
.
h_dt
=
0
.
0
f
;
p
.
force
.
v_sig
=
0
.
0
f
;
runner_iact_nonsym_force
(
r2
,
fdx
,
p
.
h
,
parts
[
k
].
h
,
&
p
,
&
parts
[
k
]
);
runner_iact_nonsym_force
(
r2
,
fdx
,
p
.
h
,
parts
[
k
].
h
,
&
p
,
&
parts
[
k
]
);
/* printf( "pairs_simple: interacting particles %lli and %lli (rho=%.3e,r=%e): a=[%.3e,%.3e,%.3e], u_dt=%.3e, h_dt=%.3e, v_sig=%.3e.\n" ,
pid , p2.id , p2.rho , sqrtf(r2) ,
p.a[0] , p.a[1] , p.a[2] ,
p.force.u_dt , p.force.h_dt , p.force.v_sig ); */
}
}
}
}
...
@@ -520,7 +514,7 @@ void engine_step ( struct engine *e , int sort_queues ) {
...
@@ -520,7 +514,7 @@ void engine_step ( struct engine *e , int sort_queues ) {
}
}
}
}
// engine_single_density( e->s->dim ,
617
8 , e->s->parts , e->s->nr_parts , e->s->periodic );
// engine_single_density( e->s->dim ,
49474
8 , e->s->parts , e->s->nr_parts , e->s->periodic );
/* Start the clock. */
/* Start the clock. */
TIMER_TIC_ND
TIMER_TIC_ND
...
@@ -538,12 +532,12 @@ void engine_step ( struct engine *e , int sort_queues ) {
...
@@ -538,12 +532,12 @@ void engine_step ( struct engine *e , int sort_queues ) {
/* Stop the clock. */
/* Stop the clock. */
TIMER_TOC
(
timer_runners
);
TIMER_TOC
(
timer_runners
);
// engine_single_force( e->s->dim ,
617
8 , e->s->parts , e->s->nr_parts , e->s->periodic );
// engine_single_force( e->s->dim ,
49474
8 , e->s->parts , e->s->nr_parts , e->s->periodic );
// for(k=0; k<10; ++k)
// for(k=0; k<10; ++k)
// printParticle(parts, k);
// printParticle(parts, k);
// printParticle( parts , 432626 );
// printParticle( parts , 432626 );
// printParticle( e->s->parts ,
617
8 , e->s->nr_parts );
// printParticle( e->s->parts ,
49474
8 , e->s->nr_parts );
/* Collect the cell data from the second kick. */
/* Collect the cell data from the second kick. */
for
(
k
=
0
;
k
<
e
->
s
->
nr_cells
;
k
++
)
{
for
(
k
=
0
;
k
<
e
->
s
->
nr_cells
;
k
++
)
{
...
...
This diff is collapsed.
Click to expand it.
src/kernel.h
+
1
−
0
View file @
0c94b5ac
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#define kernel_gamma 2.0f
#define kernel_gamma 2.0f
#define kernel_gamma2 4.0f
#define kernel_gamma2 4.0f
#define kernel_gamma3 8.0f
#define kernel_gamma3 8.0f
#define kernel_igamma 0.5f
static
float
kernel_coeffs
[
(
kernel_degree
+
1
)
*
(
kernel_ivals
+
1
)
]
__attribute__
((
aligned
(
16
)))
=
static
float
kernel_coeffs
[
(
kernel_degree
+
1
)
*
(
kernel_ivals
+
1
)
]
__attribute__
((
aligned
(
16
)))
=
{
3
.
0
/
4
.
0
*
M_1_PI
,
-
3
.
0
/
2
.
0
*
M_1_PI
,
0
.
0
,
M_1_PI
,
{
3
.
0
/
4
.
0
*
M_1_PI
,
-
3
.
0
/
2
.
0
*
M_1_PI
,
0
.
0
,
M_1_PI
,
-
0
.
25
*
M_1_PI
,
3
.
0
/
2
.
0
*
M_1_PI
,
-
3
.
0
*
M_1_PI
,
M_2_PI
,
-
0
.
25
*
M_1_PI
,
3
.
0
/
2
.
0
*
M_1_PI
,
-
3
.
0
*
M_1_PI
,
M_2_PI
,
...
...
This diff is collapsed.
Click to expand it.
src/runner_iact.h
+
32
−
36
View file @
0c94b5ac
...
@@ -229,44 +229,40 @@ __attribute__ ((always_inline)) INLINE static void runner_iact_nonsym_density (
...
@@ -229,44 +229,40 @@ __attribute__ ((always_inline)) INLINE static void runner_iact_nonsym_density (
float
dv
[
3
],
curlvr
[
3
];
float
dv
[
3
],
curlvr
[
3
];
int
k
;
int
k
;
if
(
r2
<
hi
*
hi
*
kernel_gamma2
)
{
/* Get the masses. */
mj
=
pj
->
mass
;
/* Get the masses. */
mj
=
pj
->
mass
;
/* Get r and r inverse. */
r
=
sqrtf
(
r2
);
ri
=
1
.
0
f
/
r
;
/* Compute dv dot r */
dv
[
0
]
=
pi
->
v
[
0
]
-
pj
->
v
[
0
];
dv
[
1
]
=
pi
->
v
[
1
]
-
pj
->
v
[
1
];
dv
[
2
]
=
pi
->
v
[
2
]
-
pj
->
v
[
2
];
dvdr
=
dv
[
0
]
*
dx
[
0
]
+
dv
[
1
]
*
dx
[
1
]
+
dv
[
2
]
*
dx
[
2
];
dvdr
*=
ri
;
/* Compute dv cross r */
curlvr
[
0
]
=
dv
[
1
]
*
dx
[
2
]
-
dv
[
2
]
*
dx
[
1
];
curlvr
[
1
]
=
dv
[
2
]
*
dx
[
0
]
-
dv
[
0
]
*
dx
[
2
];
curlvr
[
2
]
=
dv
[
0
]
*
dx
[
1
]
-
dv
[
1
]
*
dx
[
0
];
for
(
k
=
0
;
k
<
3
;
k
++
)
curlvr
[
k
]
*=
ri
;
h_inv
=
1
.
0
/
hi
;
xi
=
r
*
h_inv
;
kernel_deval
(
xi
,
&
wi
,
&
wi_dx
);
pi
->
rho
+=
mj
*
wi
;
pi
->
rho_dh
-=
mj
*
(
3
.
0
*
wi
+
xi
*
wi_dx
);
pi
->
density
.
wcount
+=
wi
;
pi
->
density
.
wcount_dh
-=
xi
*
wi_dx
;
pi
->
density
.
div_v
+=
mj
*
dvdr
*
wi_dx
;
/* Get r and r inverse. */
for
(
k
=
0
;
k
<
3
;
k
++
)
r
=
sqrtf
(
r2
);
pi
->
density
.
curl_v
[
k
]
+=
mj
*
curlvr
[
k
]
*
wi_dx
;
ri
=
1
.
0
f
/
r
;
}
/* Compute dv dot r */
dv
[
0
]
=
pi
->
v
[
0
]
-
pj
->
v
[
0
];
dv
[
1
]
=
pi
->
v
[
1
]
-
pj
->
v
[
1
];
dv
[
2
]
=
pi
->
v
[
2
]
-
pj
->
v
[
2
];
dvdr
=
dv
[
0
]
*
dx
[
0
]
+
dv
[
1
]
*
dx
[
1
]
+
dv
[
2
]
*
dx
[
2
];
dvdr
*=
ri
;
/* Compute dv cross r */
curlvr
[
0
]
=
dv
[
1
]
*
dx
[
2
]
-
dv
[
2
]
*
dx
[
1
];
curlvr
[
1
]
=
dv
[
2
]
*
dx
[
0
]
-
dv
[
0
]
*
dx
[
2
];
curlvr
[
2
]
=
dv
[
0
]
*
dx
[
1
]
-
dv
[
1
]
*
dx
[
0
];
for
(
k
=
0
;
k
<
3
;
k
++
)
curlvr
[
k
]
*=
ri
;
h_inv
=
1
.
0
/
hi
;
xi
=
r
*
h_inv
;
kernel_deval
(
xi
,
&
wi
,
&
wi_dx
);
pi
->
rho
+=
mj
*
wi
;
pi
->
rho_dh
-=
mj
*
(
3
.
0
*
wi
+
xi
*
wi_dx
);
pi
->
density
.
wcount
+=
wi
;
pi
->
density
.
wcount_dh
-=
xi
*
wi_dx
;
pi
->
density
.
div_v
+=
mj
*
dvdr
*
wi_dx
;
for
(
k
=
0
;
k
<
3
;
k
++
)
pi
->
density
.
curl_v
[
k
]
+=
mj
*
curlvr
[
k
]
*
wi_dx
;
}
}
/**
/**
...
...
This diff is collapsed.
Click to expand it.
src/space.h
+
1
−
1
View file @
0c94b5ac
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#define space_splitratio 0.875
#define space_splitratio 0.875
#define space_splitsize_default 400
#define space_splitsize_default 400
#define space_subsize_default 5000
#define space_subsize_default 5000
#define space_dosub
0
#define space_dosub
1
#define space_stretch 1.05
#define space_stretch 1.05
#define space_maxtaskspercell 31
#define space_maxtaskspercell 31
...
...
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