Merge branch 'develop' into use-infix-evaluation

.github/workflows/build-spack.yml

@@ -260,7 +260,6 @@ jobs:
             ${{
               (   (matrix.special == 'minimal')
                || (matrix.special == 'float')
-               || (matrix.geometry == 'geant4')
                || !matrix.geant
               ) && '1' || ''
             }}

app/celer-g4/CMakeLists.txt

@@ -88,7 +88,7 @@ if(NOT CELERITAS_USE_HepMC3 OR NOT CELERITAS_USE_Geant4)
   set(_props DISABLED true)
 endif()
 if(CELERITAS_CORE_GEO STREQUAL "Geant4")
-  # FIXME: geant4 navigator doesn't work at scale, nor through accel
+  # FIXME: geant4 navigator doesn't work with field navigator
   set(_props DISABLED true)
 endif()
 if(CELERITAS_REAL_TYPE STREQUAL "float")

app/celer-g4/TimerOutput.hh

@@ -39,6 +39,7 @@ class TimerOutput final : public OutputInterface
 
     //!@{
     //! \name Output interface
+
     //! Category of data to write
     Category category() const final { return Category::result; }
     //! Key for the entry inside the category.

src/accel/GeantSimpleCalo.hh

@@ -61,6 +61,7 @@ class GeantSimpleCalo final : public OutputInterface
 
     //!@{
     //! \name Output interface
+
     //! Category of data to write
     Category category() const final { return Category::result; }
     // Key for the entry inside the category

src/accel/GeantStepDiagnostic.hh

@@ -40,6 +40,7 @@ class GeantStepDiagnostic final : public OutputInterface
 
     //!@{
     //! \name Output interface
+
     //! Category of data to write
     Category category() const final { return Category::result; }
     //! Key for the entry inside the category.

src/accel/LocalTransporter.cc

@@ -131,17 +131,6 @@ LocalTransporter::LocalTransporter(SetupOptions const& options,
         }
     }
 
-    if (CELERITAS_CORE_GEO == CELERITAS_CORE_GEO_GEANT4)
-    {
-        /*!
-         * \todo Add support for Geant4 navigation wrapper, which requires
-         * calling \c state.ref().geometry.reset() on the local transporter
-         * thread due to thread-allocated navigator data.
-         */
-        CELER_NOT_IMPLEMENTED(
-            "offloading when using Celeritas Geant4 navigation wrapper");
-    }
-
     // Create hit processor on the local thread so that it's deallocated when
     // this object is destroyed
     StreamId stream_id{static_cast<size_type>(thread_id)};
@@ -168,6 +157,8 @@ LocalTransporter::LocalTransporter(SetupOptions const& options,
 
     // Save state for reductions at the end
     params.set_state(stream_id.get(), step_->sp_state());
+
+    CELER_ENSURE(*this);
 }
 
 //---------------------------------------------------------------------------//
@@ -311,6 +302,19 @@ void LocalTransporter::Finalize()
                    << "offloaded tracks (" << buffer_.size()
                    << " in buffer) were not flushed");
 
+    if constexpr (CELERITAS_CORE_GEO == CELERITAS_CORE_GEO_GEANT4)
+    {
+        // Geant4 navigation states *MUST* be deallocated on the thread in
+        // which they're allocated
+        auto state = std::dynamic_pointer_cast<CoreState<MemSpace::host>>(
+            step_->sp_state());
+        CELER_ASSERT(state);
+#if CELERITAS_CORE_GEO == CELERITAS_CORE_GEO_GEANT4
+        CELER_LOG_LOCAL(debug) << "Deallocating navigation states";
+        state->ref().geometry.reset();
+#endif
+    }
+
     // Reset all data
     CELER_LOG_LOCAL(debug) << "Resetting local transporter";
     *this = {};

src/accel/SetupOptions.hh

@@ -129,6 +129,7 @@ struct SetupOptions
 
     //!@{
     //! \name I/O
+
     //! GDML filename (optional: defaults to exporting existing Geant4)
     std::string geometry_file;
     //! Filename for JSON diagnostic output
@@ -143,6 +144,7 @@ struct SetupOptions
 
     //!@{
     //! \name Celeritas stepper options
+
     //! Number of track "slots" to be transported simultaneously
     size_type max_num_tracks{};
     //! Maximum number of events in use (DEPRECATED: remove in v0.6)
@@ -161,6 +163,7 @@ struct SetupOptions
 
     //!@{
     //! \name Track reordering options
+
     TrackOrder track_order{Device::num_devices() ? TrackOrder::init_charge
                                                  : TrackOrder::none};
     //!@}
@@ -170,11 +173,13 @@ struct SetupOptions
 
     //!@{
     //! \name Stepping actions
+
     AlongStepFactory make_along_step;
     //!@}
 
     //!@{
     //! \name Field options
+
     size_type max_field_substeps{100};
     //!@}
 
@@ -183,12 +188,14 @@ struct SetupOptions
 
     //!@{
     //! \name Physics options
+
     //! Do not use Celeritas physics for the given Geant4 process names
     VecString ignore_processes;
     //!@}
 
     //!@{
     //! \name CUDA options
+
     //! Per-thread stack size (may be needed for VecGeom) [B]
     size_type cuda_stack_size{};
     //! Dynamic heap size (may be needed for VecGeom) [B]
@@ -201,6 +208,7 @@ struct SetupOptions
 
     //!@{
     //! \name Diagnostic setup
+
     //! Filename base for slot diagnostics
     std::string slot_diagnostic_prefix;
     //!@}

src/accel/SetupOptionsMessenger.cc

@@ -28,15 +28,15 @@ struct UICommandTraits;
 template<>
 struct UICommandTraits<std::string>
 {
-    static inline constexpr char type_info = 's';
+    static constexpr char type_info = 's';
     static std::string const& to_string(G4String const& v) { return v; }
     static std::string from_string(G4String const& v) { return v; }
 };
 
 template<>
 struct UICommandTraits<bool>
 {
-    static inline constexpr char type_info = 'b';
+    static constexpr char type_info = 'b';
     static G4String to_string(bool v)
     {
         return G4UIcommand::ConvertToString(v);
@@ -50,7 +50,7 @@ struct UICommandTraits<bool>
 template<class T>
 struct UICommandTraits<T, std::enable_if_t<std::is_integral_v<T>>>
 {
-    static inline constexpr char type_info = 'i';
+    static constexpr char type_info = 'i';
     static std::string to_string(T v) { return std::to_string(v); }
     static long from_string(G4String const& v)
     {
@@ -69,7 +69,7 @@ struct UICommandTraits<T, std::enable_if_t<std::is_integral_v<T>>>
 template<>
 struct UICommandTraits<double>
 {
-    static inline constexpr char type_info = 'd';
+    static constexpr char type_info = 'd';
     static G4String to_string(double v)
     {
         return G4UIcommand::ConvertToString(v);

src/accel/detail/HitManager.cc

@@ -83,8 +83,10 @@ HitManager::HitManager(SPConstGeo geo,
         }
     }
 
-    // Hit processors *must* be allocated on the thread they're used because of
-    // geant4 thread-local SDs. There must be one per thread.
+    // Hit processors MUST be allocated on the thread they're used because of
+    // geant4 thread-local SDs. They MUST also be DEallocated on the same
+    // thread they're created due to Geant4 thread-local allocators.
+    // There must be one hit processor per thread.
     processor_weakptrs_.resize(num_streams);
     processors_.resize(num_streams);
 

src/celeritas/ext/GeantOpticalPhysicsOptions.hh

@@ -128,6 +128,7 @@ struct GeantOpticalPhysicsOptions
 {
     //!@{
     //! \name Optical photon creation physics
+
     //! Cherenkov radiation options
     CherenkovPhysicsOptions cherenkov;
     //! Scintillation options
@@ -136,6 +137,7 @@ struct GeantOpticalPhysicsOptions
 
     //!@{
     //! \name Optical photon physics
+
     //! Enable wavelength shifting and select a time profile
     WLSTimeProfileSelection wavelength_shifting{WLSTimeProfileSelection::delta};
     //! Enable second wavelength shifting type and select a time profile (TODO:

src/celeritas/ext/GeantPhysicsOptions.hh

@@ -99,6 +99,7 @@ struct GeantPhysicsOptions
 
     //!@{
     //! \name Gamma physics
+
     //! Enable Compton scattering
     bool compton_scattering{true};
     //! Enable the photoelectric effect
@@ -113,6 +114,7 @@ struct GeantPhysicsOptions
 
     //!@{
     //! \name Electron and positron physics
+
     //! Enable discrete Coulomb
     bool coulomb_scattering{false};
     //! Enable e- and e+ ionization
@@ -132,6 +134,7 @@ struct GeantPhysicsOptions
 
     //!@{
     //! \name Physics options
+
     //! Number of log-spaced bins per factor of 10 in energy
     int em_bins_per_decade{7};
     //! Enable universal energy fluctuations
@@ -144,6 +147,7 @@ struct GeantPhysicsOptions
 
     //!@{
     //! \name Cutoff options
+
     //! Lowest energy of any EM physics process
     MevEnergy min_energy{0.1 * 1e-3};  // 0.1 keV
     //! Highest energy of any EM physics process
@@ -160,6 +164,7 @@ struct GeantPhysicsOptions
 
     //!@{
     //! \name Multiple scattering configuration
+
     //! E-/e+ range factor for MSC models
     double msc_range_factor{0.04};
     //! Safety factor for MSC models

src/celeritas/field/FieldDriverOptions.hh

@@ -64,13 +64,13 @@ struct FieldDriverOptions
     short int max_substeps = 10;
 
     //! Initial step tolerance
-    static constexpr inline real_type initial_step_tol = 1e-6;
+    static constexpr real_type initial_step_tol = 1e-6;
 
     //! Chord distance fudge factor
-    static constexpr inline real_type dchord_tol = 1e-5 * units::millimeter;
+    static constexpr real_type dchord_tol = 1e-5 * units::millimeter;
 
     //! Lowest allowable scaling factor when searching for a chord
-    static constexpr inline real_type min_chord_shrink = 0.5;
+    static constexpr real_type min_chord_shrink = 0.5;
 
     //! Whether all data are assigned and valid
     explicit CELER_FUNCTION operator bool() const

src/celeritas/global/KernelContextException.hh

@@ -64,6 +64,7 @@ class KernelContextException : public RichContextException
 
     //!@{
     //! \name Track accessors
+
     //! Kernel thread ID
     ThreadId thread() const { return thread_; }
     //! Track slot ID

src/celeritas/io/ImportElement.hh

@@ -39,7 +39,7 @@ struct ImportIsotope
 struct ImportElement
 {
     //!@{
-    //! \name type aliases
+    //! \name Type aliases
     using IsotopeIndex = unsigned int;
     using IsotopeFrac = std::pair<IsotopeIndex, double>;
     using VecIsotopeFrac = std::vector<IsotopeFrac>;

src/celeritas/io/ImportMaterial.hh

@@ -96,9 +96,7 @@ struct ImportPhysMaterial
     using MapIntCutoff = std::map<PdgInt, ImportProductionCut>;
     //!@}
 
-#ifndef SWIG
-    static inline constexpr Index unspecified = -1;
-#endif
+    static constexpr Index unspecified = -1;
 
     Index geo_material_id{};  //!< Index in geo_materials list
     Index optical_material_id{unspecified};  //!< Optional index in optical mat

src/celeritas/io/ImportVolume.hh

@@ -39,9 +39,7 @@ struct ImportVolume
     using Index = unsigned int;
     //!@}
 
-#ifndef SWIG
-    static inline constexpr Index unspecified = -1;
-#endif
+    static constexpr Index unspecified = -1;
 
     Index geo_material_id{unspecified};  //!< Material defined by geometry
     Index region_id{unspecified};  //!< Optional region associated

src/celeritas/mat/MaterialParams.hh

@@ -112,6 +112,7 @@ class MaterialParams final : public ParamsDataInterface<MaterialParamsData>
 
     //!@{
     //! \name Material metadata
+
     //! Number of materials
     MaterialId::size_type num_materials() const { return mat_labels_.size(); }
 
@@ -127,6 +128,7 @@ class MaterialParams final : public ParamsDataInterface<MaterialParamsData>
 
     //!@{
     //! \name Element metadata
+
     //! Number of distinct elements definitions
     ElementId::size_type num_elements() const { return el_labels_.size(); }
 
@@ -142,6 +144,7 @@ class MaterialParams final : public ParamsDataInterface<MaterialParamsData>
 
     //!@{
     //! \name Isotope metadata
+
     //! Number of distinct isotope definitions
     IsotopeId::size_type num_isotopes() const { return isot_labels_.size(); }
 

src/celeritas/optical/CoreParams.hh

@@ -75,6 +75,7 @@ class CoreParams final : public ParamsDataInterface<CoreParamsData>
 
     //!@{
     //! \name Data interface
+
     //! Access data on the host
     HostRef const& host_ref() const final { return host_ref_; }
     //! Access data on the device

src/celeritas/optical/detail/OffloadParams.hh

@@ -30,6 +30,7 @@ class OffloadParams final : public AuxParamsInterface,
 
     //!@{
     //! \name Aux interface
+
     //! Short name for the action
     std::string_view label() const final { return "optical-offload"; }
     //! Index of this class instance in its registry
@@ -40,6 +41,7 @@ class OffloadParams final : public AuxParamsInterface,
 
     //!@{
     //! \name Data interface
+
     //! Access data on host
     HostRef const& host_ref() const final { return data_.host_ref(); }
     //! Access data on device

src/celeritas/optical/detail/OpticalLaunchAction.hh

@@ -78,6 +78,7 @@ class OpticalLaunchAction : public AuxParamsInterface,
 
     //!@{
     //! \name Aux/action metadata interface
+
     //! Short name for the action
     std::string_view label() const final { return "optical-offload-launch"; }
     // Name of the action (for user output)
@@ -86,6 +87,7 @@ class OpticalLaunchAction : public AuxParamsInterface,
 
     //!@{
     //! \name Aux interface
+
     //! Index of this class instance in its registry
     AuxId aux_id() const final { return aux_id_; }
     // Build optical core state data for a stream
@@ -94,6 +96,7 @@ class OpticalLaunchAction : public AuxParamsInterface,
 
     //!@{
     //! \name Action interface
+
     //! ID of the model
     ActionId action_id() const final { return action_id_; }
     //! Dependency ordering of the action