From b68408f2955a1753ee3e02302c3c0a64ef50a27a Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Mon, 20 Feb 2017 18:30:14 +0000
Subject: [PATCH] Also update calls in the test suite. Make the dump test clean
its memory.
---
src/runner.h | 2 +-
tests/test125cells.c | 4 ++--
tests/testDump.c | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/runner.h b/src/runner.h
index 53e78b0065..49ad5c9835 100644
--- a/src/runner.h
+++ b/src/runner.h
@@ -56,7 +56,7 @@ struct runner {
void runner_do_ghost(struct runner *r, struct cell *c, int timer);
void runner_do_extra_ghost(struct runner *r, struct cell *c, int timer);
void runner_do_sort(struct runner *r, struct cell *c, int flag, int clock);
-void runner_do_drift(struct runner *r, struct cell *c, int timer);
+void runner_do_drift_particles(struct runner *r, struct cell *c, int timer);
void runner_do_kick1(struct runner *r, struct cell *c, int timer);
void runner_do_kick2(struct runner *r, struct cell *c, int timer);
void runner_do_end_force(struct runner *r, struct cell *c, int timer);
diff --git a/tests/test125cells.c b/tests/test125cells.c
index 91b1cf6dc3..aedf0e0b77 100644
--- a/tests/test125cells.c
+++ b/tests/test125cells.c
@@ -580,7 +580,7 @@ int main(int argc, char *argv[]) {
// runner_do_kick1(&runner, main_cell, 0);
/* And a gentle drift */
- // runner_do_drift(&runner, main_cell, 0);
+ // runner_do_drift_particles(&runner, main_cell, 0);
/* First, sort stuff */
for (int j = 0; j < 125; ++j) runner_do_sort(&runner, cells[j], 0x1FFF, 0);
@@ -678,7 +678,7 @@ int main(int argc, char *argv[]) {
// runner_do_kick1(&runner, main_cell, 0);
/* And drift it */
- runner_do_drift(&runner, main_cell, 0);
+ runner_do_drift_particles(&runner, main_cell, 0);
/* Initialise the particles */
for (int j = 0; j < 125; ++j) runner_do_init(&runner, cells[j], 0);
diff --git a/tests/testDump.c b/tests/testDump.c
index ab74a1b1f0..32cffcbf2f 100644
--- a/tests/testDump.c
+++ b/tests/testDump.c
@@ -79,6 +79,9 @@ int main(int argc, char *argv[]) {
/* Finalize the dump. */
dump_close(&d);
+ /* Clean the threads */
+ threadpool_clean(&t);
+
/* Return a happy number. */
return 0;
}
--
GitLab