Skip to content
Snippets Groups Projects
Commit cb0b3c77 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Lock the gparts and not the multipoles when calling the gravity long-range task.

parent f53ba862
No related branches found
No related tags found
2 merge requests!566Periodic gravity calculation,!565Mesh force task
...@@ -173,7 +173,6 @@ __attribute__((always_inline)) INLINE static enum task_actions task_acts_on( ...@@ -173,7 +173,6 @@ __attribute__((always_inline)) INLINE static enum task_actions task_acts_on(
case task_type_init_grav: case task_type_init_grav:
case task_type_grav_top_level: case task_type_grav_top_level:
case task_type_grav_long_range:
case task_type_grav_mm: case task_type_grav_mm:
return task_action_multipole; return task_action_multipole;
break; break;
...@@ -181,6 +180,7 @@ __attribute__((always_inline)) INLINE static enum task_actions task_acts_on( ...@@ -181,6 +180,7 @@ __attribute__((always_inline)) INLINE static enum task_actions task_acts_on(
case task_type_drift_gpart: case task_type_drift_gpart:
case task_type_grav_down: case task_type_grav_down:
case task_type_grav_mesh: case task_type_grav_mesh:
case task_type_grav_long_range:
return task_action_gpart; return task_action_gpart;
break; break;
...@@ -292,6 +292,7 @@ void task_unlock(struct task *t) { ...@@ -292,6 +292,7 @@ void task_unlock(struct task *t) {
case task_type_drift_gpart: case task_type_drift_gpart:
case task_type_grav_mesh: case task_type_grav_mesh:
case task_type_grav_long_range:
cell_gunlocktree(ci); cell_gunlocktree(ci);
break; break;
...@@ -323,7 +324,6 @@ void task_unlock(struct task *t) { ...@@ -323,7 +324,6 @@ void task_unlock(struct task *t) {
cell_munlocktree(ci); cell_munlocktree(ci);
break; break;
case task_type_grav_long_range:
case task_type_grav_mm: case task_type_grav_mm:
cell_munlocktree(ci); cell_munlocktree(ci);
break; break;
...@@ -388,6 +388,7 @@ int task_lock(struct task *t) { ...@@ -388,6 +388,7 @@ int task_lock(struct task *t) {
case task_type_drift_gpart: case task_type_drift_gpart:
case task_type_grav_mesh: case task_type_grav_mesh:
case task_type_grav_long_range:
if (ci->ghold) return 0; if (ci->ghold) return 0;
if (cell_glocktree(ci) != 0) return 0; if (cell_glocktree(ci) != 0) return 0;
break; break;
...@@ -449,7 +450,6 @@ int task_lock(struct task *t) { ...@@ -449,7 +450,6 @@ int task_lock(struct task *t) {
} }
break; break;
case task_type_grav_long_range:
case task_type_grav_mm: case task_type_grav_mm:
/* Lock the m-poles */ /* Lock the m-poles */
if (ci->mhold) return 0; if (ci->mhold) return 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment