Merge branch 'fix-repartition-on-restart' into 'master'

Fix repartition on restart

See merge request swift/swiftsim!1592

configure.ac

@@ -207,8 +207,8 @@ AM_CONDITIONAL([HAVEMPI],[test $enable_mpi = "yes"])
 # Indicate that MPIRUN can be modified by an environment variable
 AC_ARG_VAR(MPIRUN, Path to the mpirun command if non-standard)
 
-# Add libtool support (now that CC is defined).
-LT_INIT
+# Add libtool support (now that CC is defined). Disable shared libraries by default.
+LT_INIT([disable-shared])
 
 # Need C99 and inline support.
 AC_PROG_CC_C99

src/engine_config.c

@@ -196,7 +196,11 @@ void engine_config(int restart, int fof, struct engine *e,
    * already allocated and freed on exit, so we need to copy over. */
 #ifdef WITH_MPI
   if (restart) {
+    int *celllist = e->reparttype->celllist;
+    int ncelllist = e->reparttype->ncelllist;
     memcpy(e->reparttype, reparttype, sizeof(struct repartition));
+    e->reparttype->celllist = celllist;
+    e->reparttype->ncelllist = ncelllist;
   } else {
     e->reparttype = reparttype;
   }

src/engine_split_particles.c

@@ -283,7 +283,7 @@ void engine_split_gas_particles(struct engine *e) {
 
   /* Abort if we are not doing any splitting */
   if (!e->hydro_properties->particle_splitting) return;
-  if (e->s->nr_parts == 0) return;
+  if (e->total_nr_parts == 0) return;
 
   /* Time this */
   const ticks tic = getticks();