Disabled GIZMO particle steering for vacuum particles. Disabled warning...

Disabled GIZMO particle steering for vacuum particles. Disabled warning messages for unphysical values and pathological configurations.

src/const.h

@@ -68,12 +68,12 @@
 #define GIZMO_UNPHYSICAL_RESCUE
 /* Show a warning message if an unphysical value was reset (only works if
    GIZMO_UNPHYSICAL_RESCUE is also selected). */
-#define GIZMO_UNPHYSICAL_WARNING
+//#define GIZMO_UNPHYSICAL_WARNING
 
 /* Parameters that control how GIZMO handles pathological particle
    configurations. */
 /* Show a warning message if a pathological configuration has been detected. */
-#define GIZMO_PATHOLOGICAL_WARNING
+//#define GIZMO_PATHOLOGICAL_WARNING
 /* Crash if a pathological configuration has been detected. */
 //#define GIZMO_PATHOLOGICAL_ERROR
 /* Maximum allowed gradient matrix condition number. If the condition number of

src/hydro/Gizmo/hydro_velocities.h

@@ -105,42 +105,45 @@ __attribute__((always_inline)) INLINE static void hydro_velocities_set(
     p->v[0] = p->conserved.momentum[0] / p->conserved.mass;
     p->v[1] = p->conserved.momentum[1] / p->conserved.mass;
     p->v[2] = p->conserved.momentum[2] / p->conserved.mass;
-  } else {
-    /* Vacuum particles have no fluid velocity. */
-    p->v[0] = 0.;
-    p->v[1] = 0.;
-    p->v[2] = 0.;
-  }
 
 #ifdef GIZMO_STEER_MOTION
 
-  /* Add a correction to the velocity to keep particle positions close enough to
-     the centroid of their mesh-free "cell". */
-  /* The correction term below is the same one described in Springel (2010). */
-  float ds[3];
-  ds[0] = p->geometry.centroid[0];
-  ds[1] = p->geometry.centroid[1];
-  ds[2] = p->geometry.centroid[2];
-  const float d = sqrtf(ds[0] * ds[0] + ds[1] * ds[1] + ds[2] * ds[2]);
-  const float R = get_radius_dimension_sphere(p->geometry.volume);
-  const float eta = 0.25;
-  const float etaR = eta * R;
-  const float xi = 1.;
-  const float soundspeed =
-      sqrtf(hydro_gamma * p->primitives.P / p->primitives.rho);
-  /* We only apply the correction if the offset between centroid and position is
-     too large. */
-  if (d > 0.9 * etaR) {
-    float fac = xi * soundspeed / d;
-    if (d < 1.1 * etaR) {
-      fac *= 5. * (d - 0.9 * etaR) / etaR;
+    /* Add a correction to the velocity to keep particle positions close enough
+       to
+       the centroid of their mesh-free "cell". */
+    /* The correction term below is the same one described in Springel (2010).
+     */
+    float ds[3];
+    ds[0] = p->geometry.centroid[0];
+    ds[1] = p->geometry.centroid[1];
+    ds[2] = p->geometry.centroid[2];
+    const float d = sqrtf(ds[0] * ds[0] + ds[1] * ds[1] + ds[2] * ds[2]);
+    const float R = get_radius_dimension_sphere(p->geometry.volume);
+    const float eta = 0.25;
+    const float etaR = eta * R;
+    const float xi = 1.;
+    const float soundspeed =
+        sqrtf(hydro_gamma * p->primitives.P / p->primitives.rho);
+    /* We only apply the correction if the offset between centroid and position
+       is
+       too large. */
+    if (d > 0.9 * etaR) {
+      float fac = xi * soundspeed / d;
+      if (d < 1.1 * etaR) {
+        fac *= 5. * (d - 0.9 * etaR) / etaR;
+      }
+      p->v[0] -= ds[0] * fac;
+      p->v[1] -= ds[1] * fac;
+      p->v[2] -= ds[2] * fac;
     }
-    p->v[0] -= ds[0] * fac;
-    p->v[1] -= ds[1] * fac;
-    p->v[2] -= ds[2] * fac;
-  }
 
 #endif  // GIZMO_STEER_MOTION
+  } else {
+    /* Vacuum particles have no fluid velocity. */
+    p->v[0] = 0.;
+    p->v[1] = 0.;
+    p->v[2] = 0.;
+  }
 
 #endif  // GIZMO_FIX_PARTICLES