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
7c95f7ba
Commit
7c95f7ba
authored
Jul 19, 2017
by
James Willis
Browse files
Added missing scale factor to rho_dh and wcount_dh.
parent
9b4a9673
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/hydro/Gadget2/hydro_iact.h
View file @
7c95f7ba
...
...
@@ -432,14 +432,16 @@ runner_iact_nonsym_1_vec_density(vector *r2, vector *dx, vector *dy, vector *dz,
curlvry
.
v
=
vec_mul
(
curlvry
.
v
,
ri
.
v
);
curlvrz
.
v
=
vec_mul
(
curlvrz
.
v
,
ri
.
v
);
vector
scaleFactor
;
scaleFactor
.
v
=
vec_fma
(
vec_set1
(
hydro_dimension
),
wi
.
v
,
vec_mul
(
ui
.
v
,
wi_dx
.
v
));
/* Mask updates to intermediate vector sums for particle pi. */
rhoSum
->
v
=
vec_mask_add
(
rhoSum
->
v
,
vec_mul
(
mj
.
v
,
wi
.
v
),
mask
);
rho_dhSum
->
v
=
vec_mask_sub
(
rho_dhSum
->
v
,
vec_mul
(
mj
.
v
,
vec_fma
(
vec_set1
(
hydro_dimension
),
wi
.
v
,
vec_mul
(
ui
.
v
,
wi_dx
.
v
))),
mask
);
rho_dhSum
->
v
,
vec_mul
(
mj
.
v
,
scaleFactor
.
v
),
mask
);
wcountSum
->
v
=
vec_mask_add
(
wcountSum
->
v
,
wi
.
v
,
mask
);
wcount_dhSum
->
v
=
vec_mask_sub
(
wcount_dhSum
->
v
,
vec_mul
(
ui
.
v
,
wi_dx
.
v
)
,
mask
);
wcount_dhSum
->
v
=
vec_mask_sub
(
wcount_dhSum
->
v
,
scaleFactor
.
v
,
mask
);
div_vSum
->
v
=
vec_mask_sub
(
div_vSum
->
v
,
vec_mul
(
mj
.
v
,
vec_mul
(
dvdr
.
v
,
wi_dx
.
v
)),
mask
);
curlvxSum
->
v
=
vec_mask_add
(
curlvxSum
->
v
,
...
...
@@ -540,25 +542,25 @@ runner_iact_nonsym_2_vec_density(
curlvrz
.
v
=
vec_mul
(
curlvrz
.
v
,
ri
.
v
);
curlvrz2
.
v
=
vec_mul
(
curlvrz2
.
v
,
ri2
.
v
);
vector
scaleFactor
,
scaleFactor2
;
scaleFactor
.
v
=
vec_fma
(
vec_set1
(
hydro_dimension
),
wi
.
v
,
vec_mul
(
ui
.
v
,
wi_dx
.
v
));
scaleFactor2
.
v
=
vec_fma
(
vec_set1
(
hydro_dimension
),
wi2
.
v
,
vec_mul
(
ui2
.
v
,
wi_dx2
.
v
));
/* Mask updates to intermediate vector sums for particle pi. */
/* Mask only when needed. */
if
(
mask_cond
)
{
rhoSum
->
v
=
vec_mask_add
(
rhoSum
->
v
,
vec_mul
(
mj
.
v
,
wi
.
v
),
mask
);
rhoSum
->
v
=
vec_mask_add
(
rhoSum
->
v
,
vec_mul
(
mj2
.
v
,
wi2
.
v
),
mask2
);
rho_dhSum
->
v
=
vec_mask_sub
(
rho_dhSum
->
v
,
vec_mul
(
mj
.
v
,
vec_fma
(
vec_set1
(
hydro_dimension
),
wi
.
v
,
vec_mul
(
ui
.
v
,
wi_dx
.
v
))),
mask
);
rho_dhSum
->
v
,
vec_mul
(
mj
.
v
,
scaleFactor
.
v
),
mask
);
rho_dhSum
->
v
=
vec_mask_sub
(
rho_dhSum
->
v
,
vec_mul
(
mj2
.
v
,
vec_fma
(
vec_set1
(
hydro_dimension
),
wi2
.
v
,
vec_mul
(
ui2
.
v
,
wi_dx2
.
v
))),
mask2
);
rho_dhSum
->
v
,
vec_mul
(
mj2
.
v
,
scaleFactor2
.
v
),
mask2
);
wcountSum
->
v
=
vec_mask_add
(
wcountSum
->
v
,
wi
.
v
,
mask
);
wcountSum
->
v
=
vec_mask_add
(
wcountSum
->
v
,
wi2
.
v
,
mask2
);
wcount_dhSum
->
v
=
vec_mask_sub
(
wcount_dhSum
->
v
,
vec_mul
(
ui
.
v
,
wi_dx
.
v
),
mask
);
wcount_dhSum
->
v
=
vec_mask_sub
(
wcount_dhSum
->
v
,
vec_mul
(
ui2
.
v
,
wi_dx2
.
v
),
mask2
);
wcount_dhSum
->
v
=
vec_mask_sub
(
wcount_dhSum
->
v
,
scaleFactor
.
v
,
mask
);
wcount_dhSum
->
v
=
vec_mask_sub
(
wcount_dhSum
->
v
,
scaleFactor2
.
v
,
mask2
);
div_vSum
->
v
=
vec_mask_sub
(
div_vSum
->
v
,
vec_mul
(
mj
.
v
,
vec_mul
(
dvdr
.
v
,
wi_dx
.
v
)),
mask
);
div_vSum
->
v
=
vec_mask_sub
(
...
...
@@ -578,14 +580,12 @@ runner_iact_nonsym_2_vec_density(
}
else
{
rhoSum
->
v
=
vec_add
(
rhoSum
->
v
,
vec_mul
(
mj
.
v
,
wi
.
v
));
rhoSum
->
v
=
vec_add
(
rhoSum
->
v
,
vec_mul
(
mj2
.
v
,
wi2
.
v
));
rho_dhSum
->
v
=
vec_sub
(
rho_dhSum
->
v
,
vec_mul
(
mj
.
v
,
vec_fma
(
vec_set1
(
hydro_dimension
),
wi
.
v
,
vec_mul
(
ui
.
v
,
wi_dx
.
v
))));
rho_dhSum
->
v
=
vec_sub
(
rho_dhSum
->
v
,
vec_mul
(
mj2
.
v
,
vec_fma
(
vec_set1
(
hydro_dimension
),
wi2
.
v
,
vec_mul
(
ui2
.
v
,
wi_dx2
.
v
))));
rho_dhSum
->
v
=
vec_sub
(
rho_dhSum
->
v
,
vec_mul
(
mj
.
v
,
scaleFactor
.
v
));
rho_dhSum
->
v
=
vec_sub
(
rho_dhSum
->
v
,
vec_mul
(
mj2
.
v
,
scaleFactor2
.
v
));
wcountSum
->
v
=
vec_add
(
wcountSum
->
v
,
wi
.
v
);
wcountSum
->
v
=
vec_add
(
wcountSum
->
v
,
wi2
.
v
);
wcount_dhSum
->
v
=
vec_sub
(
wcount_dhSum
->
v
,
vec_mul
(
ui
.
v
,
wi_dx
.
v
)
);
wcount_dhSum
->
v
=
vec_sub
(
wcount_dhSum
->
v
,
vec_mul
(
ui2
.
v
,
wi_dx
2
.
v
)
)
;
wcount_dhSum
->
v
=
vec_sub
(
wcount_dhSum
->
v
,
scaleFactor
.
v
);
wcount_dhSum
->
v
=
vec_sub
(
wcount_dhSum
->
v
,
scaleFactor
2
.
v
);
div_vSum
->
v
=
vec_sub
(
div_vSum
->
v
,
vec_mul
(
mj
.
v
,
vec_mul
(
dvdr
.
v
,
wi_dx
.
v
)));
div_vSum
->
v
=
vec_sub
(
div_vSum
->
v
,
vec_mul
(
mj2
.
v
,
vec_mul
(
dvdr2
.
v
,
wi_dx2
.
v
)));
curlvxSum
->
v
=
vec_add
(
curlvxSum
->
v
,
vec_mul
(
mj
.
v
,
vec_mul
(
curlvrx
.
v
,
wi_dx
.
v
)));
...
...
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