Remove bumps and relocation-on-find from vecgeom tracker

scripts/cmake-presets/executor.json

@@ -14,27 +14,21 @@
       "name": ".base",
       "hidden": true,
       "generator": "Ninja",
-      "inherits": [".spack-env"],
       "binaryDir": "${sourceDir}/build-${presetName}",
       "cacheVariables": {
         "BUILD_SHARED_LIBS":     {"type": "BOOL",   "value": "ON"},
         "BUILD_TESTING":         {"type": "BOOL",   "value": "ON"},
-        "CELERITAS_USE_covfie":  {"type": "BOOL",   "value": "ON"},
         "CELERITAS_USE_CUDA":    {"type": "BOOL",   "value": "OFF"},
         "CELERITAS_USE_DD4hep":  {"type": "BOOL",   "value": "OFF"},
         "CELERITAS_USE_LArSoft": {"type": "BOOL",   "value": "OFF"},
-        "CELERITAS_USE_HepMC3":  {"type": "BOOL",   "value": "ON"},
         "CELERITAS_USE_HIP":     {"type": "BOOL",   "value": "OFF"},
-        "CELERITAS_USE_Geant4":  {"type": "BOOL",   "value": "ON"},
         "CELERITAS_USE_MPI":     {"type": "BOOL",   "value": "OFF"},
         "CELERITAS_USE_OpenMP":  {"type": "BOOL",   "value": "OFF"},
+        "CELERITAS_USE_PNG":     {"type": "BOOL",   "value": "OFF"},
+        "CELERITAS_USE_Python":  {"type": "BOOL",   "value": "ON"},
         "CELERITAS_USE_ROOT":    {"type": "BOOL",   "value": "OFF"},
         "CELERITAS_USE_VecGeom": {"type": "BOOL",   "value": "OFF"},
         "CELERITAS_BUILD_TESTS": {"type": "BOOL",   "value": "ON"},
-        "CELERITAS_BUILTIN_CLI11": {"type": "BOOL",   "value": "OFF"},
-        "CELERITAS_BUILTIN_G4VG": {"type": "BOOL",   "value": "OFF"},
-        "CELERITAS_BUILTIN_nlohmann_json": {"type": "BOOL",   "value": "OFF"},
-        "CELERITAS_BUILTIN_GTest": {"type": "BOOL",   "value": "OFF"},
         "CMAKE_C_COMPILER_LAUNCHER": null,
         "CMAKE_CXX_COMPILER_LAUNCHER": null,
         "CMAKE_EXPORT_COMPILE_COMMANDS": {"type": "BOOL",   "value": "ON"},
@@ -47,18 +41,37 @@
         "CMAKE_CXX_FLAGS": "-Wall -Wextra -Werror -Wno-error=deprecated -pedantic -fdiagnostics-color=always"
       }
     },
+    {
+      "name": ".spackbase",
+      "hidden": true,
+      "generator": "Ninja",
+      "inherits": [".base", ".spack-env"],
+      "binaryDir": "${sourceDir}/build-${presetName}",
+      "cacheVariables": {
+        "CELERITAS_USE_covfie":  {"type": "BOOL",   "value": "ON"},
+        "CELERITAS_USE_HepMC3":  {"type": "BOOL",   "value": "ON"},
+        "CELERITAS_USE_Geant4":  {"type": "BOOL",   "value": "ON"},
+        "CELERITAS_USE_PNG":     {"type": "BOOL",   "value": "ON"},
+        "CELERITAS_USE_Python":  {"type": "BOOL",   "value": "ON"},
+        "CELERITAS_BUILD_TESTS": {"type": "BOOL",   "value": "ON"},
+        "CELERITAS_BUILTIN_CLI11": {"type": "BOOL",   "value": "OFF"},
+        "CELERITAS_BUILTIN_G4VG": {"type": "BOOL",   "value": "OFF"},
+        "CELERITAS_BUILTIN_nlohmann_json": {"type": "BOOL",   "value": "OFF"},
+        "CELERITAS_BUILTIN_GTest": {"type": "BOOL",   "value": "OFF"}
+      }
+    },
     {
       "name": "iwyu",
       "displayName": "Include-what-you-use (see scripts/dev/run-iwyu.sh)",
-      "inherits": [".base"],
+      "inherits": [".spackbase"],
       "cacheVariables": {
         "CELERITAS_BUILD_TESTS": {"type": "BOOL", "value": "OFF"},
         "CELERITAS_DEBUG":       {"type": "BOOL", "value": "OFF"}
       }
     },
     {
       "name": "min",
-      "displayName": "Goldfinger minimal build",
+      "displayName": "Executor minimal build",
       "inherits": [".base", ".debug", "default"],
       "environment": {
         "CMAKE_PREFIX_PATH": "$env{SPACK_ROOT}/var/spack/environments/celeritas-min/.spack-env/view"
@@ -72,7 +85,7 @@
     {
       "name": "base",
       "displayName": "Goldfinger default options",
-      "inherits": [".ccache", ".base", ".debug", "default"],
+      "inherits": [".ccache", ".spackbase", ".debug", "default"],
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CELERITAS_BUILD_DOCS": {"type": "BOOL", "value": "ON"},
@@ -91,15 +104,10 @@
         "CELERITAS_REAL_TYPE": "float"
       }
     },
-    {
-      "name": "mini",
-      "displayName": "Minimal deps",
-      "inherits": ["minimal", ".base", ".debug"]
-    },
     {
       "name": "si",
       "displayName": "With SI units",
-      "inherits": [".base", ".debug", "default"],
+      "inherits": [".spackbase", ".debug", "default"],
       "cacheVariables": {
         "CELERITAS_UNITS": "SI",
         "CELERITAS_CORE_GEO": "VecGeom",
@@ -109,7 +117,7 @@
     {
       "name": "vecgeom",
       "displayName": "With vecgeom",
-      "inherits": [".ccache", ".base", ".debug", "default"],
+      "inherits": [".ccache", ".spackbase", ".debug", "default"],
       "cacheVariables": {
         "CELERITAS_USE_VecGeom": {"type": "BOOL",   "value": "ON"}
       }
@@ -119,16 +127,18 @@
       "displayName": "With local vecgeom",
       "inherits": [".ccache", ".base", ".debug", "default"],
       "environment": {
-        "CMAKE_PREFIX_PATH": "/opt/spack/opt/spack/tahoe/geant4/11.3.2/7oydgus:/opt/spack/opt/spack/tahoe/googletest/1.17.0/c332ssk:/opt/spack/opt/spack/tahoe/cli11/2.5.0/pmtt6hb:/opt/spack/opt/spack/tahoe/nlohmann-json/3.12.0/dkrlqn3:/opt/spack/opt/spack/tahoe/covfie/0.15.3/tlzukkw:/opt/spack/opt/spack/tahoe/zlib-ng/2.2.4/qbbzbte"
+        "CMAKE_PREFIX_PATH": "/opt/spack/opt/spack/tahoe/geant4/11.3.2/gykadvh:/opt/spack/opt/spack/tahoe/covfie/0.15.4/r5g2psb:/opt/spack/opt/spack/tahoe/nlohmann-json/3.12.0/7mlcviu:/opt/spack/opt/spack/tahoe/cli11/2.6.1/znuwv76:/opt/spack/opt/spack/tahoe/googletest/1.17.0/rmxgcak"
       },
       "cacheVariables": {
+        "CELERITAS_BUILTIN_CLI11": {"type": "BOOL",   "value": "OFF"},
         "CELERITAS_BUILTIN_G4VG": {"type": "BOOL", "value": "ON"},
+        "CELERITAS_BUILTIN_GTest": {"type": "BOOL",   "value": "OFF"},
+        "CELERITAS_BUILTIN_nlohmann_json": {"type": "BOOL",   "value": "OFF"},
         "CELERITAS_USE_HepMC3":  {"type": "BOOL", "value": "OFF"},
         "CELERITAS_USE_ROOT":  {"type": "BOOL", "value": "OFF"},
         "CELERITAS_USE_VecGeom": {"type": "BOOL",   "value": "ON"},
         "CELERITAS_VecGeom_SURFACE": {"type": "BOOL",   "value": "ON"},
         "VecGeom_DIR": {"type": "PATH", "value": "/Users/seth/Code/vecgeom/install/lib/cmake/VecGeom"}
-
       }
     },
     {
@@ -150,7 +160,7 @@
     {
       "name": "geant4",
       "displayName": "Using Geant4 navigation",
-      "inherits": [".base", ".debug", "default"],
+      "inherits": [".spackbase", ".debug", "default"],
       "cacheVariables": {
         "CELERITAS_CORE_GEO": "Geant4",
         "CELERITAS_UNITS": "CLHEP",
@@ -162,7 +172,7 @@
     {
       "name": "reldeb",
       "displayName": "With ORANGE in optimized+errcheck mode",
-      "inherits": [".reldeb", ".base"],
+      "inherits": [".reldeb", ".spackbase"],
       "cacheVariables": {
         "CELERITAS_USE_ROOT": {"type": "BOOL",   "value": "OFF"}
       }
@@ -178,15 +188,15 @@
     {
       "name": "ndebug",
       "displayName": "With ORANGE in optimized mode",
-      "inherits": [".ccache", ".ndebug", ".base"],
+      "inherits": [".ccache", ".ndebug", ".spackbase"],
       "cacheVariables": {
         "CELERITAS_USE_ROOT": {"type": "BOOL",   "value": "OFF"}
       }
     },
     {
       "name": "ndebug-vecgeom",
       "displayName": "With vecgeom, clhep, dev g4 in optimized mode",
-      "inherits": [".ccache", ".base", ".ndebug", "vecgeom"],
+      "inherits": [".ccache", ".spackbase", ".ndebug", "vecgeom"],
       "cacheVariables": {
         "CELERITAS_USE_HepMC3":  {"type": "BOOL", "value": "OFF"},
         "CELERITAS_USE_ROOT":    {"type": "BOOL", "value": "OFF"},

src/celeritas/field/FieldPropagator.hh

@@ -181,7 +181,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"
 
@@ -56,7 +57,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/corecel/math/Algorithms.hh

@@ -537,6 +537,8 @@ inline CELER_FUNCTION T fastpow(T a, T b)
 /*!
  * Use fused multiply-add for generic calculations.
  *
+ * \f[ x \gets a \times b + y \f]
+ *
  * This provides a floating point specialization so that \c fma can be used in
  * code that is accelerated for floating point calculations but still works
  * correctly with integer arithmetic.

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
 };
 
 //---------------------------------------------------------------------------//

src/geocel/detail/LengthUnits.hh

@@ -23,14 +23,17 @@ namespace lengthunits
 CELER_ICC meter{100};
 CELER_ICC centimeter{1};
 CELER_ICC millimeter{0.1};
+inline constexpr char const label[] = "cm";
 #elif CELERITAS_UNITS == CELERITAS_UNITS_SI
 CELER_ICC meter{1};
 CELER_ICC centimeter{0.01};
 CELER_ICC millimeter{0.001};
+inline constexpr char const label[] = "m";
 #elif CELERITAS_UNITS == CELERITAS_UNITS_CLHEP
 CELER_ICC meter{1000};
 CELER_ICC centimeter{10};
 CELER_ICC millimeter{1};
+inline constexpr char const label[] = "mm";
 #else
 #    error "CELERITAS_UNITS is undefined"
 #endif

src/geocel/vg/VecgeomData.hh

@@ -13,7 +13,6 @@
 #include "corecel/Macros.hh"
 #include "corecel/Types.hh"
 #include "corecel/data/Collection.hh"
-#include "corecel/data/CollectionBuilder.hh"
 #include "corecel/sys/ThreadId.hh"
 #include "geocel/Types.hh"
 

src/geocel/vg/VecgeomParams.cc

@@ -837,6 +837,7 @@ void VecgeomParams::build_volume_tracking()
 
         check_bvh_device_pointers();
         check_navindex_device_pointers();
+        detail::check_other_device_pointers();
 
         device_ownership_ = Ownership::value;
     }