Fixed the remaining tests

src/Makefile.am

@@ -45,7 +45,7 @@ include_HEADERS = space.h runner.h queue.h task.h lock.h cell.h part.h const.h \
     physical_constants.h physical_constants_cgs.h potential.h version.h \
     hydro_properties.h riemann.h threadpool.h cooling.h cooling_struct.h sourceterms.h \
     sourceterms_struct.h statistics.h memswap.h cache.h runner_doiact_vec.h profiler.h \
-    dump.h logger.h
+    dump.h logger.h active.h timeline.h
 
 # Common source files
 AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \
@@ -60,7 +60,7 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \
 nobase_noinst_HEADERS = align.h approx_math.h atomic.h cycle.h error.h inline.h kernel_hydro.h kernel_gravity.h \
 		 kernel_long_gravity.h vector.h cache.h runner_doiact.h runner_doiact_vec.h runner_doiact_grav.h runner_doiact_fft.h \
                  units.h intrinsics.h minmax.h kick.h timestep.h drift.h adiabatic_index.h io_properties.h \
-		 dimension.h equation_of_state.h active.h timeline.h \
+		 dimension.h equation_of_state.h \
 		 gravity.h gravity_io.h \
 		 gravity/Default/gravity.h gravity/Default/gravity_iact.h gravity/Default/gravity_io.h \
 		 gravity/Default/gravity_debug.h gravity/Default/gravity_part.h  \

src/swift.h

@@ -23,6 +23,7 @@
 #include "../config.h"
 
 /* Local headers. */
+#include "active.h"
 #include "atomic.h"
 #include "cache.h"
 #include "cell.h"
@@ -54,6 +55,7 @@
 #include "sourceterms.h"
 #include "space.h"
 #include "task.h"
+#include "timeline.h"
 #include "timers.h"
 #include "tools.h"
 #include "units.h"

tests/test125cells.c

@@ -292,8 +292,8 @@ struct cell *make_cell(size_t n, const double offset[3], double size, double h,
 #endif
 
 #ifdef SWIFT_DEBUG_CHECKS
-        part->ti_drift = 1;
-        part->ti_kick = 1;
+        part->ti_drift = 8;
+        part->ti_kick = 8;
 #endif
 
         ++part;
@@ -315,9 +315,9 @@ struct cell *make_cell(size_t n, const double offset[3], double size, double h,
   cell->loc[1] = offset[1];
   cell->loc[2] = offset[2];
 
-  cell->ti_old = 1;
-  cell->ti_end_min = 1;
-  cell->ti_end_max = 1;
+  cell->ti_old = 8;
+  cell->ti_end_min = 8;
+  cell->ti_end_max = 8;
 
   // shuffle_particles(cell->parts, cell->count);
 
@@ -531,7 +531,7 @@ int main(int argc, char *argv[]) {
   engine.physical_constants = &prog_const;
   engine.s = &space;
   engine.time = 0.1f;
-  engine.ti_current = 1;
+  engine.ti_current = 8;
 
   struct runner runner;
   runner.e = &engine;
@@ -577,10 +577,10 @@ int main(int argc, char *argv[]) {
     const ticks tic = getticks();
 
     /* Start with a gentle kick */
-    //runner_do_kick1(&runner, main_cell, 0);
+    // runner_do_kick1(&runner, main_cell, 0);
 
     /* And a gentle drift */
-    //runner_do_drift(&runner, main_cell, 0);
+    // runner_do_drift(&runner, main_cell, 0);
 
     /* First, sort stuff */
     for (int j = 0; j < 125; ++j) runner_do_sort(&runner, cells[j], 0x1FFF, 0);
@@ -651,7 +651,7 @@ int main(int argc, char *argv[]) {
 
     /* Finally, give a gentle kick */
     runner_do_end_force(&runner, main_cell, 0);
-    //runner_do_kick2(&runner, main_cell, 0);
+    // runner_do_kick2(&runner, main_cell, 0);
 
     const ticks toc = getticks();
     time += toc - tic;
@@ -675,7 +675,7 @@ int main(int argc, char *argv[]) {
   const ticks tic = getticks();
 
   /* Kick the central cell */
-  //runner_do_kick1(&runner, main_cell, 0);
+  // runner_do_kick1(&runner, main_cell, 0);
 
   /* And drift it */
   runner_do_drift(&runner, main_cell, 0);
@@ -746,7 +746,7 @@ int main(int argc, char *argv[]) {
 
   /* Finally, give a gentle kick */
   runner_do_end_force(&runner, main_cell, 0);
-  //runner_do_kick2(&runner, main_cell, 0);
+  // runner_do_kick2(&runner, main_cell, 0);
 
   const ticks toc = getticks();
 

tests/test27cells.c

@@ -128,7 +128,13 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
         part->entropy_one_over_gamma = 1.f;
 #endif
 
-        part->time_bin = 0;
+        part->time_bin = 1;
+
+#ifdef SWIFT_DEBUG_CHECKS
+        part->ti_drift = 8;
+        part->ti_kick = 8;
+#endif
+
         ++part;
       }
     }
@@ -146,9 +152,9 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   cell->loc[1] = offset[1];
   cell->loc[2] = offset[2];
 
-  cell->ti_old = 0;
-  cell->ti_end_min = 0;
-  cell->ti_end_max = 0;
+  cell->ti_old = 8;
+  cell->ti_end_min = 8;
+  cell->ti_end_max = 8;
 
   shuffle_particles(cell->parts, cell->count);
 
@@ -389,7 +395,7 @@ int main(int argc, char *argv[]) {
   struct engine engine;
   engine.s = &space;
   engine.time = 0.1f;
-  engine.ti_current = 0;
+  engine.ti_current = 8;
 
   struct runner runner;
   runner.e = &engine;

tests/testPair.c

@@ -69,6 +69,12 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
         part->mass = density * volume / count;
 #endif
         part->time_bin = 1;
+
+#ifdef SWIFT_DEBUG_CHECKS
+        part->ti_drift = 8;
+        part->ti_kick = 8;
+#endif
+
         ++part;
       }
     }
@@ -86,9 +92,9 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   cell->loc[1] = offset[1];
   cell->loc[2] = offset[2];
 
-  cell->ti_old = 1;
-  cell->ti_end_min = 1;
-  cell->ti_end_max = 1;
+  cell->ti_old = 8;
+  cell->ti_end_min = 8;
+  cell->ti_end_max = 8;
 
   shuffle_particles(cell->parts, cell->count);
 
@@ -245,7 +251,7 @@ int main(int argc, char *argv[]) {
 
   engine.s = &space;
   engine.time = 0.1f;
-  engine.ti_current = 1;
+  engine.ti_current = 8;
   runner.e = &engine;
 
   volume = particles * particles * particles;