[Core][MPI] Adding SpatialSearchResultContainer/SpatialSearchResultContainerVector and SearchWrapper (v.3.0)

kratos/geometries/bounding_box.h

@@ -8,7 +8,7 @@
 //                   Kratos default license: kratos/license.txt
 //
 //  Main authors:    Pooyan Dadvand
-//                  
+//
 
 #pragma once
 
@@ -35,7 +35,7 @@ namespace Kratos
  * @author Pooyan Dadvand
  */
 template <typename TPointType>
-class BoundingBox 
+class BoundingBox
 {
 public:
     ///@name Type Definitions
@@ -56,10 +56,10 @@ class BoundingBox
     };
 
     /// Constructor with min and max points
-    BoundingBox(TPointType const& MinPoint, TPointType const& MaxPoint) :
-		mMinMaxPoints{MinPoint,MaxPoint} 
+    BoundingBox(TPointType const& MinPoint, TPointType const& MaxPoint)
     {
-
+        noalias(GetMinPoint().Coordinates()) = MinPoint.Coordinates();
+        noalias(GetMaxPoint().Coordinates()) = MaxPoint.Coordinates();
     }
 
     /// Copy constructor
@@ -176,7 +176,7 @@ class BoundingBox
      * @details This function returns a reference to the minimum point stored in the object.
      * @return A reference to the minimum point.
      */
-    TPointType& GetMinPoint() 
+    TPointType& GetMinPoint()
     {
         return mMinMaxPoints[0];
     }
@@ -186,7 +186,7 @@ class BoundingBox
      * @details This function returns a constant reference to the minimum point stored in the object. It allows you to access the minimum point without modifying it.
      * @return A constant reference to the minimum point.
      */
-    TPointType const& GetMinPoint() const 
+    TPointType const& GetMinPoint() const
     {
         return mMinMaxPoints[0];
     }
@@ -196,7 +196,7 @@ class BoundingBox
      * @details This function returns a reference to the maximum point stored in the object.
      * @return A reference to the maximum point.
      */
-    TPointType& GetMaxPoint() 
+    TPointType& GetMaxPoint()
     {
         return mMinMaxPoints[1];
     }
@@ -244,9 +244,9 @@ class BoundingBox
 private:
     ///@name Static Member Variables
     ///@{
-    
+
     static constexpr unsigned int Dimension = 3;
-    
+
     ///@}
     ///@name Member Variables
     ///@{

kratos/includes/data_communicator.h

@@ -80,32 +80,37 @@ virtual void Max(const std::vector<__VA_ARGS__>& rLocalValues, std::vector<__VA_
  * The returned value is defined on all ranks.
  */
 #ifndef KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_INTERFACE_FOR_TYPE
-#define KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_INTERFACE_FOR_TYPE(...)                                         \
-virtual __VA_ARGS__ SumAll(const __VA_ARGS__& rLocalValue) const { return rLocalValue; }                                 \
-virtual std::vector<__VA_ARGS__> SumAll(const std::vector<__VA_ARGS__>& rLocalValues) const {                           \
-    return rLocalValues;                                                                                                \
-}                                                                                                                       \
-virtual void SumAll(const std::vector<__VA_ARGS__>& rLocalValues, std::vector<__VA_ARGS__>& rGlobalValues) const {      \
-    KRATOS_DATA_COMMUNICATOR_DEBUG_SIZE_CHECK(rLocalValues.size(), rGlobalValues.size(), "SumAll");                     \
-    rGlobalValues = SumAll(rLocalValues);                                                                               \
-}                                                                                                                       \
-virtual __VA_ARGS__ MinAll(const __VA_ARGS__& rLocalValue) const { return rLocalValue; }                                 \
-virtual std::vector<__VA_ARGS__> MinAll(const std::vector<__VA_ARGS__>& rLocalValues) const {                           \
-    return rLocalValues;                                                                                                \
-}                                                                                                                       \
-virtual void MinAll(const std::vector<__VA_ARGS__>& rLocalValues, std::vector<__VA_ARGS__>& rGlobalValues) const {      \
-    KRATOS_DATA_COMMUNICATOR_DEBUG_SIZE_CHECK(rLocalValues.size(), rGlobalValues.size(), "MinAll");                     \
-    rGlobalValues = MinAll(rLocalValues);                                                                               \
-}                                                                                                                       \
-virtual __VA_ARGS__ MaxAll(const __VA_ARGS__& rLocalValue) const { return rLocalValue; }                                 \
-virtual std::vector<__VA_ARGS__> MaxAll(const std::vector<__VA_ARGS__>& rLocalValues) const {                           \
-    return rLocalValues;                                                                                                \
-}                                                                                                                       \
-virtual void MaxAll(const std::vector<__VA_ARGS__>& rLocalValues, std::vector<__VA_ARGS__>& rGlobalValues) const {      \
-    KRATOS_DATA_COMMUNICATOR_DEBUG_SIZE_CHECK(rLocalValues.size(), rGlobalValues.size(), "MaxAll");                     \
-    rGlobalValues = MaxAll(rLocalValues);                                                                               \
-}                                                                                                                       \
+#define KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_INTERFACE_FOR_TYPE(...)                                                             \
+virtual __VA_ARGS__ SumAll(const __VA_ARGS__& rLocalValue) const { return rLocalValue; }                                                    \
+virtual std::vector<__VA_ARGS__> SumAll(const std::vector<__VA_ARGS__>& rLocalValues) const {                                               \
+    return rLocalValues;                                                                                                                    \
+}                                                                                                                                           \
+virtual void SumAll(const std::vector<__VA_ARGS__>& rLocalValues, std::vector<__VA_ARGS__>& rGlobalValues) const {                          \
+    KRATOS_DATA_COMMUNICATOR_DEBUG_SIZE_CHECK(rLocalValues.size(), rGlobalValues.size(), "SumAll");                                         \
+    rGlobalValues = SumAll(rLocalValues);                                                                                                   \
+}                                                                                                                                           \
+virtual __VA_ARGS__ MinAll(const __VA_ARGS__& rLocalValue) const { return rLocalValue; }                                                    \
+virtual std::vector<__VA_ARGS__> MinAll(const std::vector<__VA_ARGS__>& rLocalValues) const {                                               \
+    return rLocalValues;                                                                                                                    \
+}                                                                                                                                           \
+virtual void MinAll(const std::vector<__VA_ARGS__>& rLocalValues, std::vector<__VA_ARGS__>& rGlobalValues) const {                          \
+    KRATOS_DATA_COMMUNICATOR_DEBUG_SIZE_CHECK(rLocalValues.size(), rGlobalValues.size(), "MinAll");                                         \
+    rGlobalValues = MinAll(rLocalValues);                                                                                                   \
+}                                                                                                                                           \
+virtual __VA_ARGS__ MaxAll(const __VA_ARGS__& rLocalValue) const { return rLocalValue; }                                                    \
+virtual std::vector<__VA_ARGS__> MaxAll(const std::vector<__VA_ARGS__>& rLocalValues) const {                                               \
+    return rLocalValues;                                                                                                                    \
+}                                                                                                                                           \
+virtual void MaxAll(const std::vector<__VA_ARGS__>& rLocalValues, std::vector<__VA_ARGS__>& rGlobalValues) const {                          \
+    KRATOS_DATA_COMMUNICATOR_DEBUG_SIZE_CHECK(rLocalValues.size(), rGlobalValues.size(), "MaxAll");                                         \
+    rGlobalValues = MaxAll(rLocalValues);                                                                                                   \
+}
+#endif
 
+#ifndef KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE
+#define KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(...)                                                         \
+virtual std::pair<__VA_ARGS__, int> MinLocAll(const __VA_ARGS__& rLocalValue) const { return std::pair<__VA_ARGS__, int>(rLocalValue, 0); } \
+virtual std::pair<__VA_ARGS__, int> MaxLocAll(const __VA_ARGS__& rLocalValue) const { return std::pair<__VA_ARGS__, int>(rLocalValue, 0); }
 #endif
 
 // Compute the partial sum of the given quantity from rank 0 to the current rank (included).
@@ -115,7 +120,7 @@ virtual void MaxAll(const std::vector<__VA_ARGS__>& rLocalValues, std::vector<__
  */
 #ifndef KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_SCANSUM_INTERFACE_FOR_TYPE
 #define KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_SCANSUM_INTERFACE_FOR_TYPE(...)                                       \
-virtual __VA_ARGS__ ScanSum(const __VA_ARGS__& rLocalValue) const { return rLocalValue; }                            \
+virtual __VA_ARGS__ ScanSum(const __VA_ARGS__& rLocalValue) const { return rLocalValue; }                           \
 virtual std::vector<__VA_ARGS__> ScanSum(const std::vector<__VA_ARGS__>& rLocalValues) const {                      \
     return rLocalValues;                                                                                            \
 }                                                                                                                   \
@@ -394,6 +399,13 @@ class KRATOS_API(KRATOS_CORE) DataCommunicator
     KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_PUBLIC_INTERFACE_FOR_TYPE(Vector)
     KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_PUBLIC_INTERFACE_FOR_TYPE(Matrix)
 
+    // MinLoc and MaxLoc AllReduce operations
+    KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(char)
+    KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(int)
+    KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(unsigned int)
+    KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(long unsigned int)
+    KRATOS_BASE_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(double)
+
     // Reduce operations
 
     virtual bool AndReduce(

kratos/mpi/includes/mpi_data_communicator.h

@@ -60,6 +60,12 @@ void MaxAll(const std::vector<__VA_ARGS__>& rLocalValues, std::vector<__VA_ARGS_
 
 #endif
 
+#ifndef KRATOS_MPI_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE
+#define KRATOS_MPI_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(...)                                  \
+std::pair<__VA_ARGS__, int> MinLocAll(const __VA_ARGS__& rLocalValue) const override;                               \
+std::pair<__VA_ARGS__, int> MaxLocAll(const __VA_ARGS__& rLocalValue) const override;
+#endif
+
 #ifndef KRATOS_MPI_DATA_COMMUNICATOR_DECLARE_SCANSUM_INTERFACE_FOR_TYPE
 #define KRATOS_MPI_DATA_COMMUNICATOR_DECLARE_SCANSUM_INTERFACE_FOR_TYPE(...)                                            \
 __VA_ARGS__ ScanSum(const __VA_ARGS__& rLocalValue) const override;                                                     \
@@ -217,6 +223,13 @@ class KRATOS_API(KRATOS_MPI_CORE) MPIDataCommunicator: public DataCommunicator
     KRATOS_MPI_DATA_COMMUNICATOR_DECLARE_PUBLIC_INTERFACE_FOR_TYPE(Vector)
     KRATOS_MPI_DATA_COMMUNICATOR_DECLARE_PUBLIC_INTERFACE_FOR_TYPE(Matrix)
 
+    // MinLoc and MaxLoc AllReduce operations
+    KRATOS_MPI_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(char)
+    KRATOS_MPI_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(int)
+    KRATOS_MPI_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(unsigned int)
+    KRATOS_MPI_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(long unsigned int)
+    KRATOS_MPI_DATA_COMMUNICATOR_DECLARE_ALLREDUCE_LOC_INTERFACE_FOR_TYPE(double)
+
     // Reduce operations
 
     bool AndReduce(
@@ -380,6 +393,12 @@ class KRATOS_API(KRATOS_MPI_CORE) MPIDataCommunicator: public DataCommunicator
         const std::vector<TDataType>& rLocalValues,
         MPI_Op Operation) const;
 
+    template<class TDataType>
+    std::pair<TDataType, int> AllReduceDetailWithLocation(
+        const std::pair<TDataType, int>& rLocalValues,
+        MPI_Op Operation
+        ) const;
+
     template<class TDataType> void ScanDetail(
         const TDataType& rLocalValues,
         TDataType& rReducedValues,

kratos/mpi/includes/mpi_message.h

@@ -12,11 +12,15 @@
 
 #pragma once
 
+// System includes
 #include <string>
 #include <vector>
 #include <type_traits>
+
+// External includes
 #include "mpi.h"
 
+// Project includes
 #include "containers/array_1d.h"
 #include "containers/flags.h"
 #include "utilities/data_type_traits.h"
@@ -84,6 +88,46 @@ template<> struct MPIDataType<int64_t>
     }
 };
 
+template<> struct MPIDataType<std::pair<char, int>>
+{
+    static inline MPI_Datatype DataType()
+    {
+        return MPI_2INT;
+    }
+};
+
+template<> struct MPIDataType<std::pair<int, int>>
+{
+    static inline MPI_Datatype DataType()
+    {
+        return MPI_2INT;
+    }
+};
+
+template<> struct MPIDataType<std::pair<unsigned int, int>>
+{
+    static inline MPI_Datatype DataType()
+    {
+        return MPI_2INT;
+    }
+};
+
+template<> struct MPIDataType<std::pair<long unsigned int, int>>
+{
+    static inline MPI_Datatype DataType()
+    {
+        return MPI_LONG_INT;
+    }
+};
+
+template<> struct MPIDataType<std::pair<double, int>>
+{
+    static inline MPI_Datatype DataType()
+    {
+        return MPI_DOUBLE_INT;
+    }
+};
+
 }
 
 template<class TDataType> class MPIMessage