Send 'failed' state back to propagation applier

Author: sethrj

src/celeritas/alongstep/detail/PropagationApplier.hh

@@ -114,6 +114,11 @@ PropagationApplierBaseImpl<MP>::operator()(CoreTrackView& track)
 #endif
         auto propagate = make_propagator(track);
         p = propagate(sim.step_length());
+        if (CELER_UNLIKELY(p.failed))
+        {
+            track.apply_errored();
+            return;
+        }
         tracks_can_loop = propagate.tracks_can_loop();
         CELER_ASSERT(p.distance > 0);
 #if CELERITAS_DEBUG

src/celeritas/field/FieldPropagator.hh

@@ -197,7 +197,13 @@ FieldPropagator<SubstepperT, GTV>::operator()(real_type step) -> result_type
         real_type const update_length = substep.length * linear_step.distance
                                         / chord.length;
 
-        if (!linear_step.boundary)
+        if (CELER_UNLIKELY(geo_.failed()))
+        {
+            // Time to die
+            result.failed = true;
+            return result;
+        }
+        else if (!linear_step.boundary)
         {
             // No boundary intersection along the chord: accept substep
             // movement inside the current volume and reset the remaining

src/celeritas/field/LinearPropagator.hh

@@ -6,6 +6,7 @@
 //---------------------------------------------------------------------------//
 #pragma once
 
+#include "corecel/Macros.hh"
 #include "corecel/math/Algorithms.hh"
 #include "geocel/Types.hh"
 
@@ -78,7 +79,11 @@ CELER_FUNCTION auto LinearPropagator<GTV>::operator()(real_type dist)
 
     result_type result = geo_.find_next_step(dist);
 
-    if (result.boundary)
+    if (CELER_UNLIKELY(geo_.failed()))
+    {
+        result.failed = true;
+    }
+    else if (result.boundary)
     {
         geo_.move_to_boundary();
     }

src/geocel/Types.hh

@@ -109,12 +109,17 @@ struct GeoTrackInitializer
  *
  * The boundary flag means that the geometry is step limiting, but the surface
  * crossing must be called externally.
+ *
+ * \todo Change to a status type, or have separate "propagation" and "next
+ * step" result types. Currently this is copied from the geometry state to the
+ * propagation result because the track view failure flags are ephemeral.
  */
 struct Propagation
 {
     real_type distance{0};  //!< Distance traveled
     bool boundary{false};  //!< True if hit a boundary before given distance
     bool looping{false};  //!< True if track is looping in the field propagator
+    bool failed{false};  //!< True if a failure state occurred
 };
 
 //---------------------------------------------------------------------------//