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
3b1777d3
Commit
3b1777d3
authored
7 years ago
by
James Willis
Browse files
Options
Downloads
Patches
Plain Diff
Pass hj_inv as a vector instead of a pointer.
parent
7dd6e919
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!406
Doself2 vectorisation
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/hydro/Gadget2/hydro_iact.h
+2
-3
2 additions, 3 deletions
src/hydro/Gadget2/hydro_iact.h
tests/testInteractions.c
+5
-3
5 additions, 3 deletions
tests/testInteractions.c
with
7 additions
and
6 deletions
src/hydro/Gadget2/hydro_iact.h
+
2
−
3
View file @
3b1777d3
...
...
@@ -1181,7 +1181,7 @@ runner_iact_nonsym_1_vec_force(
vector
viz
,
vector
pirho
,
vector
grad_hi
,
vector
piPOrho2
,
vector
balsara_i
,
vector
ci
,
float
*
Vjx
,
float
*
Vjy
,
float
*
Vjz
,
float
*
Pjrho
,
float
*
Grad_hj
,
float
*
PjPOrho2
,
float
*
Balsara_j
,
float
*
Cj
,
float
*
Mj
,
vector
hi_inv
,
float
*
H
j_inv
,
vector
*
a_hydro_xSum
,
vector
*
a_hydro_ySum
,
vector
h
j_inv
,
vector
*
a_hydro_xSum
,
vector
*
a_hydro_ySum
,
vector
*
a_hydro_zSum
,
vector
*
h_dtSum
,
vector
*
v_sigSum
,
vector
*
entropy_dtSum
,
mask_t
mask
)
{
...
...
@@ -1189,7 +1189,7 @@ runner_iact_nonsym_1_vec_force(
vector
r
,
ri
;
vector
vjx
,
vjy
,
vjz
,
dvx
,
dvy
,
dvz
;
vector
pjrho
,
grad_hj
,
pjPOrho2
,
balsara_j
,
cj
,
mj
,
hj_inv
;
vector
pjrho
,
grad_hj
,
pjPOrho2
,
balsara_j
,
cj
,
mj
;
vector
xi
,
xj
;
vector
hid_inv
,
hjd_inv
;
vector
wi_dx
,
wj_dx
,
wi_dr
,
wj_dr
,
dvdr
;
...
...
@@ -1210,7 +1210,6 @@ runner_iact_nonsym_1_vec_force(
pjPOrho2
.
v
=
vec_load
(
PjPOrho2
);
balsara_j
.
v
=
vec_load
(
Balsara_j
);
cj
.
v
=
vec_load
(
Cj
);
hj_inv
.
v
=
vec_load
(
Hj_inv
);
fac_mu
.
v
=
vec_set1
(
1
.
f
);
/* Will change with cosmological integration */
...
...
This diff is collapsed.
Click to expand it.
tests/testInteractions.c
+
5
−
3
View file @
3b1777d3
...
...
@@ -607,17 +607,19 @@ void test_force_interactions(struct part test_part, struct part *parts,
&
a_hydro_zSum
,
&
h_dtSum
,
&
v_sigSum
,
&
entropy_dtSum
,
mask
,
mask2
,
0
);
}
else
{
/* Only use one vector for interaction. */
vector
r2
,
dx
,
dy
,
dz
;
vector
r2
,
dx
,
dy
,
dz
,
hj
,
hj_inv
;
r2
.
v
=
vec_load
(
&
(
r2q
[
i
]));
dx
.
v
=
vec_load
(
&
(
dxq
[
i
]));
dy
.
v
=
vec_load
(
&
(
dyq
[
i
]));
dz
.
v
=
vec_load
(
&
(
dzq
[
i
]));
hj
.
v
=
vec_load
(
&
hj_invq
[
i
]);
hj_inv
=
vec_reciprocal
(
hj
);
runner_iact_nonsym_1_vec_force
(
&
r2
,
&
dx
,
&
dy
,
&
dz
,
vix_vec
,
viy_vec
,
viz_vec
,
rhoi_vec
,
grad_hi_vec
,
pOrhoi2_vec
,
balsara_i_vec
,
ci_vec
,
&
(
vjxq
[
i
]),
&
(
vjyq
[
i
]),
&
(
vjzq
[
i
]),
&
(
rhojq
[
i
]),
&
(
grad_hjq
[
i
]),
&
(
pOrhoj2q
[
i
]),
&
(
balsarajq
[
i
]),
&
(
cjq
[
i
]),
&
(
mjq
[
i
]),
hi_inv_vec
,
&
(
hj_inv
q
[
i
])
,
&
(
balsarajq
[
i
]),
&
(
cjq
[
i
]),
&
(
mjq
[
i
]),
hi_inv_vec
,
hj_inv
,
&
a_hydro_xSum
,
&
a_hydro_ySum
,
&
a_hydro_zSum
,
&
h_dtSum
,
&
v_sigSum
,
&
entropy_dtSum
,
mask
);
}
...
...
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