Variable initialization is now done correctly. Moving mesh hydro does not work properly yet.

src/hydro/Shadowswift/hydro.h

@@ -240,13 +240,14 @@ __attribute__((always_inline)) INLINE static void hydro_convert_quantities(
   p->mass = m = p->conserved.mass;
   p->primitives.rho = m / volume;
 
-  /* P actually contains internal energy at this point */
-  p->primitives.P *= hydro_gamma_minus_one * p->primitives.rho;
-
   p->conserved.momentum[0] = momentum[0] = m * p->primitives.v[0];
   p->conserved.momentum[1] = momentum[1] = m * p->primitives.v[1];
   p->conserved.momentum[2] = momentum[2] = m * p->primitives.v[2];
-  p->conserved.energy = p->primitives.P / hydro_gamma_minus_one * volume;
+
+  p->primitives.P =
+      hydro_gamma_minus_one * p->conserved.energy * p->primitives.rho;
+
+  p->conserved.energy *= m;
 }
 
 /**

src/hydro/Shadowswift/hydro_io.h

@@ -44,9 +44,9 @@ void hydro_read_particles(struct part* parts, struct io_props* list,
                                 parts, conserved.mass);
   list[3] = io_make_input_field("SmoothingLength", FLOAT, 1, COMPULSORY,
                                 UNIT_CONV_LENGTH, parts, h);
-  list[4] =
-      io_make_input_field("InternalEnergy", FLOAT, 1, COMPULSORY,
-                          UNIT_CONV_ENERGY_PER_UNIT_MASS, parts, primitives.P);
+  list[4] = io_make_input_field("InternalEnergy", FLOAT, 1, COMPULSORY,
+                                UNIT_CONV_ENERGY_PER_UNIT_MASS, parts,
+                                conserved.energy);
   list[5] = io_make_input_field("ParticleIDs", ULONGLONG, 1, COMPULSORY,
                                 UNIT_CONV_NO_UNITS, parts, id);
   list[6] = io_make_input_field("Accelerations", FLOAT, 3, OPTIONAL,

tests/testVoronoi3D.c

@@ -1220,6 +1220,31 @@ int main() {
   voronoi_cell_interact(&cell, x3, 4);
   voronoi_cell_interact(&cell, x4, 5);
   voronoi_cell_interact(&cell, x5, 6);
+  float expected_midpoints[6][3], expected_areas[6];
+  expected_areas[0] = 0.25f;
+  expected_midpoints[0][0] = 0.25f;
+  expected_midpoints[0][1] = 0.5f;
+  expected_midpoints[0][2] = 0.5f;
+  expected_areas[1] = 0.25f;
+  expected_midpoints[1][0] = 0.75f;
+  expected_midpoints[1][1] = 0.5f;
+  expected_midpoints[1][2] = 0.5f;
+  expected_areas[2] = 0.25f;
+  expected_midpoints[2][0] = 0.5f;
+  expected_midpoints[2][1] = 0.25f;
+  expected_midpoints[2][2] = 0.5f;
+  expected_areas[3] = 0.25f;
+  expected_midpoints[3][0] = 0.5f;
+  expected_midpoints[3][1] = 0.75f;
+  expected_midpoints[3][2] = 0.5f;
+  expected_areas[4] = 0.25f;
+  expected_midpoints[4][0] = 0.5f;
+  expected_midpoints[4][1] = 0.5f;
+  expected_midpoints[4][2] = 0.25f;
+  expected_areas[5] = 0.25f;
+  expected_midpoints[5][0] = 0.5f;
+  expected_midpoints[5][1] = 0.5f;
+  expected_midpoints[5][2] = 0.75f;
 
   /* Interact with some more neighbours to check if they are properly ignored */
   float xE0[3] = {0.6f, 0.0f, 0.1f};
@@ -1242,18 +1267,22 @@ int main() {
 
   /* Check faces. */
   float A, midpoint[3];
-  A = voronoi_get_face(&cell, 1, midpoint);
-  if (A) {
-    if (fabs(A - 0.25f) > 1.e-5) {
-      error("Wrong surface area: %g!", A);
+  for (int i = 0; i < 6; ++i) {
+    A = voronoi_get_face(&cell, i + 1, midpoint);
+    if (A) {
+      if (fabs(A - expected_areas[i]) > 1.e-5) {
+        error("Wrong surface area: %g!", A);
+      }
+      if (fabs(midpoint[0] - expected_midpoints[i][0]) > 1.e-5 ||
+          fabs(midpoint[1] - expected_midpoints[i][1]) > 1.e-5 ||
+          fabs(midpoint[2] - expected_midpoints[i][2]) > 1.e-5) {
+        error("Wrong face midpoint: %g %g %g (should be %g %g %g)!",
+              midpoint[0], midpoint[1], midpoint[2], expected_midpoints[i][0],
+              expected_midpoints[i][1], expected_midpoints[i][2]);
+      }
+    } else {
+      error("Neighbour %i not found!", i);
     }
-    if (fabs(midpoint[0] - 0.25f) > 1.e-5 || fabs(midpoint[1] - 0.5f) > 1.e-5 ||
-        fabs(midpoint[2] - 0.5f) > 1.e-5) {
-      error("Wrong face midpoint: %g %g %g!", midpoint[0], midpoint[1],
-            midpoint[2]);
-    }
-  } else {
-    error("Neighbour not found!");
   }
 
   test_degeneracies();