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
b5157431
Commit
b5157431
authored
7 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Removed more debugging code
parent
60bca9f9
No related branches found
No related tags found
1 merge request
!566
Periodic gravity calculation
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/runner_doiact_grav.h
+2
-24
2 additions, 24 deletions
src/runner_doiact_grav.h
with
2 additions
and
24 deletions
src/runner_doiact_grav.h
+
2
−
24
View file @
b5157431
...
@@ -355,15 +355,6 @@ static INLINE void runner_dopair_grav_pp_truncated(
...
@@ -355,15 +355,6 @@ static INLINE void runner_dopair_grav_pp_truncated(
runner_iact_grav_pp_truncated
(
r2
,
h2_i
,
h_inv_i
,
h_inv3_i
,
mass_j
,
runner_iact_grav_pp_truncated
(
r2
,
h2_i
,
h_inv_i
,
h_inv3_i
,
mass_j
,
r_s_inv
,
&
f_ij
,
&
pot_ij
);
r_s_inv
,
&
f_ij
,
&
pot_ij
);
/* if (e->s->parts[-gparts_i[pid].id_or_neg_offset].id == ICHECK) { */
/* if (pjd < gcount_j) */
/* message("Interacting with particle ID= %lld f_ij=%e", */
/* e->s->parts[-gparts_j[pjd].id_or_neg_offset].id, f_ij); */
/* // else */
/* // message("Interacting with particle ID= %lld (padded) f_ij=%e", */
/* // e->s->parts[-gparts_j[pjd].id_or_neg_offset].id, f_ij); */
/* } */
/* Store it back */
/* Store it back */
a_x
+=
f_ij
*
dx
;
a_x
+=
f_ij
*
dx
;
a_y
+=
f_ij
*
dy
;
a_y
+=
f_ij
*
dy
;
...
@@ -603,13 +594,6 @@ static INLINE void runner_dopair_grav_pm_truncated(
...
@@ -603,13 +594,6 @@ static INLINE void runner_dopair_grav_pm_truncated(
runner_iact_grav_pm_truncated
(
dx
,
dy
,
dz
,
r2
,
h_i
,
h_inv_i
,
r_s_inv
,
runner_iact_grav_pm_truncated
(
dx
,
dy
,
dz
,
r2
,
h_i
,
h_inv_i
,
r_s_inv
,
multi_j
,
&
f_x
,
&
f_y
,
&
f_z
,
&
pot_ij
);
multi_j
,
&
f_x
,
&
f_y
,
&
f_z
,
&
pot_ij
);
/* if (e->s->parts[-gparts_i[pid].id_or_neg_offset].id == ICHECK) { */
/* if (pid < gcount_i) */
/* message("Interacting with m-pole f_ij=%e M_000=%e dx=[%e %e %e] %e
* %e", */
/* f_x / dx, multi_j->M_000, dx, dy, dz, x_i, CoM_j[0]); */
/* } */
/* Store it back */
/* Store it back */
a_x
[
pid
]
+=
f_x
;
a_x
[
pid
]
+=
f_x
;
a_y
[
pid
]
+=
f_y
;
a_y
[
pid
]
+=
f_y
;
...
@@ -1534,8 +1518,6 @@ static INLINE void runner_do_grav_long_range(struct runner *r, struct cell *ci,
...
@@ -1534,8 +1518,6 @@ static INLINE void runner_do_grav_long_range(struct runner *r, struct cell *ci,
/* Flag that contributions will be recieved */
/* Flag that contributions will be recieved */
multi_i
->
pot
.
interacted
=
1
;
multi_i
->
pot
.
interacted
=
1
;
int
cc
=
0
;
/* Loop over all the top-level cells and go for a M-M interaction if
/* Loop over all the top-level cells and go for a M-M interaction if
* well-separated */
* well-separated */
for
(
int
n
=
0
;
n
<
nr_cells
;
++
n
)
{
for
(
int
n
=
0
;
n
<
nr_cells
;
++
n
)
{
...
@@ -1580,17 +1562,13 @@ static INLINE void runner_do_grav_long_range(struct runner *r, struct cell *ci,
...
@@ -1580,17 +1562,13 @@ static INLINE void runner_do_grav_long_range(struct runner *r, struct cell *ci,
continue
;
continue
;
}
}
++
cc
;
/* Call the PM interaction fucntion on the active sub-cells of ci */
/* Call the PM interaction fucntion on the active sub-cells of ci */
// runner_dopair_recursive_grav_pm(r, ci, cj);
runner_dopair_grav_mm
(
r
,
ci
,
cj
);
runner_dopair_grav_mm
(
r
,
ci
,
cj
);
// runner_dopair_recursive_grav_pm(r, ci, cj);
}
/* We are in charge of this pair */
}
/* We are in charge of this pair */
}
/* Loop over top-level cells */
}
/* Loop over top-level cells */
// message("cc=%d", cc);
if
(
timer
)
TIMER_TOC
(
timer_dograv_long_range
);
if
(
timer
)
TIMER_TOC
(
timer_dograv_long_range
);
}
}
...
...
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