Merge pull request #683 from Xiangyu-Hu/fix/transform-shape-bounds

Fix `TransformShape::findBounds`
Xiangyu-Hu · Nov 21, 2024 · 62a6a9c · 62a6a9c
2 parents 00815cb + 7f3ab0a
commit 62a6a9c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/shared/geometries/transform_shape.h b/src/shared/geometries/transform_shape.h
@@ -72,13 +72,36 @@ class TransformShape : public BaseShapeType
   protected:
     Transform transform_;
 
+    /// Returns the AABB of the rotated underlying shape's AABB
+    /// ⚠️ It is not the tight fit AABB of the underlying shape
+    /// But at least it encloses the underlying shape fully
     virtual BoundingBox findBounds() override
     {
         BoundingBox original_bound = BaseShapeType::findBounds();
-        return BoundingBox(transform_.shiftFrameStationToBase(original_bound.first_),
-                           transform_.shiftFrameStationToBase(original_bound.second_));
+        Vecd bb_min = Vecd::Constant(MaxReal);
+        Vecd bb_max = Vecd::Constant(-MaxReal);
+        for (auto x : {original_bound.first_.x(), original_bound.second_.x()})
+        {
+            for (auto y : {original_bound.first_.y(), original_bound.second_.y()})
+            {
+                if constexpr (Dimensions == 3)
+                {
+                    for (auto z : {original_bound.first_.z(), original_bound.second_.z()})
+                    {
+                        bb_min = bb_min.cwiseMin(transform_.shiftFrameStationToBase(Vecd(x, y, z)));
+                        bb_max = bb_max.cwiseMax(transform_.shiftFrameStationToBase(Vecd(x, y, z)));
+                    }
+                }
+                else
+                {
+                    bb_min = bb_min.cwiseMin(transform_.shiftFrameStationToBase(Vecd(x, y)));
+                    bb_max = bb_max.cwiseMax(transform_.shiftFrameStationToBase(Vecd(x, y)));
+                }
+            }
+        }
+        return BoundingBox(bb_min, bb_max);
     };
 };
 } // namespace SPH
 
-#endif // TRANSFORM_SHAPE_H
+#endif // TRANSFORM_SHAPE_H
diff --git a/src/shared/shared_ck/particle_dynamics/general_dynamics/general_reduce_ck.hpp b/src/shared/shared_ck/particle_dynamics/general_dynamics/general_reduce_ck.hpp
@@ -16,7 +16,7 @@ template <typename DataType, typename NormType, class DynamicsIdentifier>
 template <class ExecutionPolicy, class EncloserType>
 VariableNormCK<DataType, NormType, DynamicsIdentifier>::ReduceKernel::
     ReduceKernel(const ExecutionPolicy &ex_policy, EncloserType &encloser)
-    : variable_(encloser.dv_variable_->template DelegatedDataField(ex_policy)) {}
+    : variable_(encloser.dv_variable_->DelegatedDataField(ex_policy)) {}
 //=================================================================================================//
 template <class ExecutionPolicy, class EncloserType>
 TotalKineticEnergyCK::ReduceKernel::