Code formatting and minor code fixes.

src/equation_of_state/planetary/hm80.h

@@ -137,10 +137,10 @@ INLINE static void convert_units_HM80(struct HM80_params *mat,
   // Table energies in SI
   mat->log_u_min +=
       logf(J_kg_to_erg_g /
-          units_cgs_conversion_factor(us, UNIT_CONV_ENERGY_PER_UNIT_MASS));
+           units_cgs_conversion_factor(us, UNIT_CONV_ENERGY_PER_UNIT_MASS));
   mat->log_u_max +=
       logf(J_kg_to_erg_g /
-          units_cgs_conversion_factor(us, UNIT_CONV_ENERGY_PER_UNIT_MASS));
+           units_cgs_conversion_factor(us, UNIT_CONV_ENERGY_PER_UNIT_MASS));
 
   // Table Pressures in Mbar
   for (int i = 0; i < mat->num_rho; i++) {

src/hydro/MinimalMultiMat/hydro_part.h

@@ -161,7 +161,7 @@ struct part {
 
   /*! Material identifier flag (integer) */
   enum material_id mat_id;
-  
+
   /*! Time-step length */
   timebin_t time_bin;
 

tests/test125cells.c

@@ -120,6 +120,8 @@ void set_energy_state(struct part *part, enum pressure_field press, float size,
   part->u = pressure / (hydro_gamma_minus_one * density);
 #elif defined(MINIMAL_SPH)
   part->u = pressure / (hydro_gamma_minus_one * density);
+#elif defined(MINIMAL_MULTI_MAT_SPH)
+  part->u = pressure / (hydro_gamma_minus_one * density);
 #elif defined(GIZMO_SPH) || defined(SHADOWFAX_SPH)
   part->primitives.P = pressure;
 #else
@@ -403,7 +405,8 @@ void dump_particle_fields(char *fileName, struct cell *main_cell,
             main_cell->parts[pid].v[0], main_cell->parts[pid].v[1],
             main_cell->parts[pid].v[2], main_cell->parts[pid].h,
             hydro_get_comoving_density(&main_cell->parts[pid]),
-#if defined(MINIMAL_SPH) || defined(SHADOWFAX_SPH)
+#if defined(MINIMAL_SPH) || defined(MINIMAL_MULTI_MAT_SPH) || \
+    defined(SHADOWFAX_SPH)
             0.f,
 #else
             main_cell->parts[pid].density.div_v,

tests/testEOS.c

@@ -87,7 +87,7 @@ int main(int argc, char *argv[]) {
   struct unit_system us;
   const struct phys_const *phys_const = 0;  // Unused placeholder
   const struct swift_params *params = 0;    // Unused placeholder
-  const float J_kg_to_erg_g = 1e4;  // Convert J/kg to erg/g
+  const float J_kg_to_erg_g = 1e4;          // Convert J/kg to erg/g
   char filename[64];
   // Output table params
   const int num_rho = 100, num_u = 100;
@@ -210,12 +210,10 @@ int main(int argc, char *argv[]) {
   units_init(&us, 5.9724e27, 6.3710e8, 1.f, 1.f, 1.f);
   log_rho_min -= logf(units_cgs_conversion_factor(&us, UNIT_CONV_DENSITY));
   log_rho_max -= logf(units_cgs_conversion_factor(&us, UNIT_CONV_DENSITY));
-  log_u_min +=
-      logf(J_kg_to_erg_g /
-           units_cgs_conversion_factor(&us, UNIT_CONV_ENERGY_PER_UNIT_MASS));
-  log_u_max +=
-      logf(J_kg_to_erg_g /
-           units_cgs_conversion_factor(&us, UNIT_CONV_ENERGY_PER_UNIT_MASS));
+  log_u_min += logf(J_kg_to_erg_g / units_cgs_conversion_factor(
+                                        &us, UNIT_CONV_ENERGY_PER_UNIT_MASS));
+  log_u_max += logf(J_kg_to_erg_g / units_cgs_conversion_factor(
+                                        &us, UNIT_CONV_ENERGY_PER_UNIT_MASS));
 
   // Initialise the EOS materials
   eos_init(&eos, phys_const, &us, params);
@@ -252,8 +250,8 @@ int main(int argc, char *argv[]) {
     log_u += log_u_step;
 
     if (do_output == 1)
-      fprintf(f, "%.6e ", A1_u[i] *
-              units_cgs_conversion_factor(&us, UNIT_CONV_ENERGY_PER_UNIT_MASS));
+      fprintf(f, "%.6e ", A1_u[i] * units_cgs_conversion_factor(
+                                        &us, UNIT_CONV_ENERGY_PER_UNIT_MASS));
   }
   if (do_output == 1) fprintf(f, "\n");
 
@@ -276,7 +274,5 @@ int main(int argc, char *argv[]) {
   return 0;
 }
 #else
-int main() {
-  return 0;
-}
+int main() { return 0; }
 #endif

tests/testInteractions.c

@@ -104,7 +104,8 @@ struct part *make_particles(size_t count, double *offset, double spacing,
  */
 void prepare_force(struct part *parts, size_t count) {
 
-#if !defined(GIZMO_SPH) && !defined(SHADOWFAX_SPH) && !defined(MINIMAL_SPH)
+#if !defined(GIZMO_SPH) && !defined(SHADOWFAX_SPH) && !defined(MINIMAL_SPH) && \
+    !defined(MINIMAL_MULTI_MAT_SPH)
   struct part *p;
   for (size_t i = 0; i < count; ++i) {
     p = &parts[i];
@@ -131,7 +132,8 @@ void dump_indv_particle_fields(char *fileName, struct part *p) {
           "%8.5f %8.5f %13e %13e %13e %13e %13e %8.5f %8.5f\n",
           p->id, p->x[0], p->x[1], p->x[2], p->v[0], p->v[1], p->v[2], p->h,
           hydro_get_comoving_density(p),
-#if defined(MINIMAL_SPH) || defined(SHADOWFAX_SPH)
+#if defined(MINIMAL_SPH) || defined(MINIMAL_MULTI_MAT_SPH) || \
+    defined(SHADOWFAX_SPH)
           0.f,
 #else
           p->density.div_v,