Construct BIH based options in OrangeInput

Author: elliottbiondo

src/orange/OrangeInput.hh

@@ -21,6 +21,8 @@
 #include "surf/VariantSurface.hh"
 #include "transform/VariantTransform.hh"
 
+#include "detail/BIHBuilder.hh"
+
 namespace celeritas
 {
 //---------------------------------------------------------------------------//
@@ -159,6 +161,19 @@ struct RectArrayInput
     }
 };
 
+//---------------------------------------------------------------------------//
+/*!
+ * Options that govern the geometry construction process.
+ */
+struct ConstructionOptions
+{
+    //! Options for Bounding Interval Hierarchy (BIH) construction
+    detail::BIHBuilder::Options bih_options;
+
+    //! Whether the options are valid
+    explicit operator bool() const { return static_cast<bool>(bih_options); }
+};
+
 //---------------------------------------------------------------------------//
 //! Possible types of universe inputs
 using VariantUniverseInput = std::variant<UnitInput, RectArrayInput>;
@@ -171,11 +186,18 @@ struct OrangeInput
 {
     std::vector<VariantUniverseInput> universes;
 
+    ConstructionOptions construction_opts;
+
     //! Relative and absolute error for construction and transport
     Tolerance<> tol;
 
     //! Whether the unit definition is valid
-    explicit operator bool() const { return !universes.empty() && tol; }
+    explicit operator bool() const
+    {
+        return !universes.empty() &&
+
+               static_cast<bool>(construction_opts) && tol;
+    }
 };
 
 //---------------------------------------------------------------------------//

src/orange/OrangeParams.cc

@@ -204,7 +204,8 @@ OrangeParams::OrangeParams(OrangeInput&& input, SPConstVolumes&& volumes)
                                                       &impl_volume_labels,
                                                       &host_data};
         Overload insert_universe{
-            detail::UnitInserter{&insert_universe_base, &host_data},
+            detail::UnitInserter{
+                &insert_universe_base, &host_data, &(input.construction_opts)},
             detail::RectArrayInserter{&insert_universe_base, &host_data}};
 
         for (auto&& u : input.universes)

src/orange/detail/BIHBuilder.hh

@@ -55,7 +55,10 @@ class BIHBuilder
     struct Options
     {
         //! Minimum number of bboxes needed to trigger a partitioning attempt
-        size_type min_split_size;
+        size_type min_split_size = 2;
+
+        //! Whether the options are valid
+        explicit operator bool() const { return min_split_size >= 2; }
     };
 
     using VecBBox = std::vector<FastBBox>;

src/orange/detail/UnitInserter.cc

@@ -266,9 +266,11 @@ std::string to_string(VolumeInput::VariantLabel const& vlabel)
 /*!
  * Construct from full parameter data.
  */
-UnitInserter::UnitInserter(UniverseInserter* insert_universe, Data* orange_data)
+UnitInserter::UnitInserter(UniverseInserter* insert_universe,
+                           Data* orange_data,
+                           ConstructionOptions* opts)
     : orange_data_(orange_data)
-    , build_bih_tree_{&orange_data_->bih_tree_data, BIHBuilder::Options{2}}
+    , build_bih_tree_{&orange_data_->bih_tree_data, opts->bih_options}
     , insert_transform_{&orange_data_->transforms, &orange_data_->reals}
     , build_surfaces_{&orange_data_->surface_types,
                       &orange_data_->real_ids,

src/orange/detail/UnitInserter.hh

@@ -39,7 +39,9 @@ class UnitInserter
 
   public:
     // Construct from full parameter data
-    UnitInserter(UniverseInserter* insert_universe, Data* orange_data);
+    UnitInserter(UniverseInserter* insert_universe,
+                 Data* orange_data,
+                 ConstructionOptions* opts);
 
     // Create a simple unit and store in in OrangeParamsData
     UniverseId operator()(UnitInput&& inp);