From 1a13e28d15f077f1c8d45ed92e881ea3c8c9fbef Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Tue, 12 Sep 2017 14:42:59 +0100
Subject: [PATCH] Reinstate missing pointer indirection for external gravity
dependencies that had disappeared in merge.
---
src/engine.c | 2 +-
src/swift.h | 1 +
tests/testGravityDerivatives.c | 3 ---
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 93c430d611..0ede028f52 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -2086,7 +2086,7 @@ static inline void engine_make_external_gravity_dependencies(
struct scheduler *sched, struct task *gravity, struct cell *c) {
/* init --> external gravity --> kick */
- scheduler_addunlock(sched, c->drift_gpart, gravity);
+ scheduler_addunlock(sched, c->super->drift_gpart, gravity);
scheduler_addunlock(sched, gravity, c->super->kick2);
}
diff --git a/src/swift.h b/src/swift.h
index 1d1a7c7d04..a5556730ae 100644
--- a/src/swift.h
+++ b/src/swift.h
@@ -35,6 +35,7 @@
#include "engine.h"
#include "error.h"
#include "gravity.h"
+#include "gravity_derivatives.h"
#include "gravity_properties.h"
#include "hydro.h"
#include "hydro_properties.h"
diff --git a/tests/testGravityDerivatives.c b/tests/testGravityDerivatives.c
index 0a811cbda4..ff5c18208e 100644
--- a/tests/testGravityDerivatives.c
+++ b/tests/testGravityDerivatives.c
@@ -930,9 +930,6 @@ int main() {
unsigned long long cpufreq = 0;
clocks_set_cpufreq(cpufreq);
- /* Choke on FP-exceptions */
- feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
-
/* Relative tolerance */
const double tol = 1e-4;
--
GitLab