Commit fcb8e0e0 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Make the long-range gravity task lock/unlock the multipoles and not the gparts.

parent df729bf4
...@@ -690,7 +690,7 @@ int main(int argc, char *argv[]) { ...@@ -690,7 +690,7 @@ int main(int argc, char *argv[]) {
} }
#ifdef WITH_MPI #ifdef WITH_MPI
if(periodic && with_self_gravity) if (periodic && with_self_gravity)
error("Periodic self-gravity over MPI temporarily disabled."); error("Periodic self-gravity over MPI temporarily disabled.");
#endif #endif
...@@ -729,7 +729,6 @@ int main(int argc, char *argv[]) { ...@@ -729,7 +729,6 @@ int main(int argc, char *argv[]) {
"ICs.", "ICs.",
N_total[0], N_total[2], N_total[1]); N_total[0], N_total[2], N_total[1]);
/* Verify that the fields to dump actually exist */ /* Verify that the fields to dump actually exist */
if (myrank == 0) io_check_output_fields(params, N_total); if (myrank == 0) io_check_output_fields(params, N_total);
......
...@@ -286,7 +286,6 @@ void task_unlock(struct task *t) { ...@@ -286,7 +286,6 @@ 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;
...@@ -319,6 +318,7 @@ void task_unlock(struct task *t) { ...@@ -319,6 +318,7 @@ void task_unlock(struct task *t) {
break; break;
case task_type_grav_mm: case task_type_grav_mm:
case task_type_grav_long_range:
cell_munlocktree(ci); cell_munlocktree(ci);
break; break;
...@@ -382,7 +382,6 @@ int task_lock(struct task *t) { ...@@ -382,7 +382,6 @@ 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;
...@@ -444,6 +443,7 @@ int task_lock(struct task *t) { ...@@ -444,6 +443,7 @@ 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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment