From c616a929064f31036b99c0369933ab7b56a54ccf Mon Sep 17 00:00:00 2001
From: "Peter W. Draper" <p.w.draper@durham.ac.uk>
Date: Tue, 1 Aug 2017 13:12:51 +0100
Subject: [PATCH] Fix issues with new sort arrays in tests

---
 tests/test125cells.c   | 7 +++++--
 tests/test27cells.c    | 7 +++++--
 tests/testPair.c       | 7 +++++--
 tests/testPeriodicBC.c | 7 +++++--
 tests/testSPHStep.c    | 7 +++++--
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/tests/test125cells.c b/tests/test125cells.c
index a34bc00e84..d4490c47ae 100644
--- a/tests/test125cells.c
+++ b/tests/test125cells.c
@@ -340,7 +340,8 @@ struct cell *make_cell(size_t n, const double offset[3], double size, double h,
   // shuffle_particles(cell->parts, cell->count);
 
   cell->sorted = 0;
-  cell->sort = NULL;
+  for (int k = 0; k < 13; k++)
+    cell->sort[k] = NULL;
 
   return cell;
 }
@@ -348,7 +349,9 @@ struct cell *make_cell(size_t n, const double offset[3], double size, double h,
 void clean_up(struct cell *ci) {
   free(ci->parts);
   free(ci->xparts);
-  free(ci->sort);
+  for (int k = 0; k < 13; k++)
+    if (ci->sort[k] != NULL)
+      free(ci->sort[k]);
   free(ci);
 }
 
diff --git a/tests/test27cells.c b/tests/test27cells.c
index 458129edd3..38ed5b7ef4 100644
--- a/tests/test27cells.c
+++ b/tests/test27cells.c
@@ -178,14 +178,17 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   shuffle_particles(cell->parts, cell->count);
 
   cell->sorted = 0;
-  cell->sort = NULL;
+  for (int k = 0; k < 13; k++)
+    cell->sort[k] = NULL;
 
   return cell;
 }
 
 void clean_up(struct cell *ci) {
   free(ci->parts);
-  free(ci->sort);
+  for (int k = 0; k < 13; k++)
+    if (ci->sort[k] != NULL)
+      free(ci->sort[k]);
   free(ci);
 }
 
diff --git a/tests/testPair.c b/tests/testPair.c
index 539f04425a..e1327ba9ea 100644
--- a/tests/testPair.c
+++ b/tests/testPair.c
@@ -121,14 +121,17 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   shuffle_particles(cell->parts, cell->count);
 
   cell->sorted = 0;
-  cell->sort = NULL;
+  for (int k = 0; k < 13; k++)
+    cell->sort[k] = NULL;
 
   return cell;
 }
 
 void clean_up(struct cell *ci) {
   free(ci->parts);
-  free(ci->sort);
+  for (int k = 0; k < 13; k++)
+    if (ci->sort[k] != NULL)
+      free(ci->sort[k]);
   free(ci);
 }
 
diff --git a/tests/testPeriodicBC.c b/tests/testPeriodicBC.c
index 469ca9b15b..7f3623e6af 100644
--- a/tests/testPeriodicBC.c
+++ b/tests/testPeriodicBC.c
@@ -177,14 +177,17 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   shuffle_particles(cell->parts, cell->count);
 
   cell->sorted = 0;
-  cell->sort = NULL;
+  for (int k = 0; k < 13; k++)
+    cell->sort[k] = NULL;
 
   return cell;
 }
 
 void clean_up(struct cell *ci) {
   free(ci->parts);
-  free(ci->sort);
+  for (int k = 0; k < 13; k++)
+    if (ci->sort[k] != NULL)
+      free(ci->sort[k]);
   free(ci);
 }
 
diff --git a/tests/testSPHStep.c b/tests/testSPHStep.c
index c3df2ca6da..3e1f6b961d 100644
--- a/tests/testSPHStep.c
+++ b/tests/testSPHStep.c
@@ -81,7 +81,8 @@ struct cell *make_cell(size_t N, float cellSize, int offset[3], int id_offset) {
   cell->ti_end_max = 1;
 
   cell->sorted = 0;
-  cell->sort = NULL;
+  for (int k = 0; k < 13; k++)
+    cell->sort[k] = NULL;
 
   return cell;
 }
@@ -211,7 +212,9 @@ int main() {
   for (int j = 0; j < 27; ++j) {
     free(cells[j]->parts);
     free(cells[j]->xparts);
-    free(cells[j]->sort);
+    for (int k = 0; k < 13; k++)
+      if (cells[j]->sort[k] != NULL)
+        free(cells[j]->sort[k]);
     free(cells[j]);
   }
 
-- 
GitLab