Merge pull request #679 from sebproell/revert-arborx

sebproell · web-flow · commit 7cc46232104a · 2025-04-23T13:12:10.000+02:00
Revert ArborX update
diff --git a/cmake/configure/configure_ArborX.cmake b/cmake/configure/configure_ArborX.cmake
@@ -23,7 +23,7 @@ else() # Fetch ArborX from GIT repository
   # Unconditionally turn on MPI support inside ArborX
   set(ARBORX_ENABLE_MPI "ON")
   set(ARBORX_GIT_REPO "https://github.com/arborx/ArborX.git")
-  set(ARBORX_GIT_TAG "041bf18e0bea7ab57f21dc0ee793389738c8cf11") #v2.0
+  set(ARBORX_GIT_TAG "58c5d9a85380bc85c27b4124ef747e245d6e1201") #latest hash on 31.03.2025
 
   fetchcontent_declare(
     arborx
diff --git a/src/beam3/4C_beam3_base.cpp b/src/beam3/4C_beam3_base.cpp
@@ -10,9 +10,9 @@
 #include "4C_beaminteraction_calc_utils.hpp"
 #include "4C_browniandyn_input.hpp"  // enums
 #include "4C_comm_pack_helpers.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_params.hpp"
 #include "4C_fem_geometry_periodic_boundingbox.hpp"
-#include "4C_geometric_search_bounding_volume.hpp"
-#include "4C_geometric_search_params.hpp"
 #include "4C_global_data.hpp"
 #include "4C_mat_beam_templated_material_generic.hpp"
 #include "4C_structure_new_elements_paramsinterface.hpp"
diff --git a/src/beaminteraction/src/4C_beaminteraction_submodel_evaluator_beamcontact.cpp b/src/beaminteraction/src/4C_beaminteraction_submodel_evaluator_beamcontact.cpp
@@ -28,9 +28,9 @@
 #include "4C_beaminteraction_submodel_evaluator_beamcontact_assembly_manager_indirect.hpp"
 #include "4C_binstrategy.hpp"
 #include "4C_comm_mpi_utils.hpp"
-#include "4C_geometric_search_bvh.hpp"
-#include "4C_geometric_search_params.hpp"
-#include "4C_geometric_search_visualization.hpp"
+#include "4C_fem_geometric_search_bvh.hpp"
+#include "4C_fem_geometric_search_params.hpp"
+#include "4C_fem_geometric_search_visualization.hpp"
 #include "4C_geometry_pair_line_to_3D_evaluation_data.hpp"
 #include "4C_global_data.hpp"
 #include "4C_inpar_geometry_pair.hpp"
diff --git a/src/core/fem/src/CMakeLists.txt b/src/core/fem/src/CMakeLists.txt
@@ -9,5 +9,6 @@ add_subdirectory(condition)
 add_subdirectory(discretization)
 add_subdirectory(dofset)
 add_subdirectory(general)
+add_subdirectory(geometric_search)
 add_subdirectory(geometry)
 add_subdirectory(nurbs_discretization)
diff --git a/src/core/fem/src/condition/4C_fem_condition_periodic.cpp b/src/core/fem/src/condition/4C_fem_condition_periodic.cpp
@@ -10,7 +10,7 @@
 #include "4C_comm_utils.hpp"
 #include "4C_fem_discretization.hpp"
 #include "4C_fem_dofset_pbc.hpp"
-#include "4C_geometric_search_matchingoctree.hpp"
+#include "4C_fem_geometric_search_matchingoctree.hpp"
 #include "4C_linalg_utils_densematrix_communication.hpp"
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 #include "4C_linalg_utils_sparse_algebra_print.hpp"
diff --git a/src/core/fem/src/dofset/4C_fem_dofset_definedmapping_wrapper.cpp b/src/core/fem/src/dofset/4C_fem_dofset_definedmapping_wrapper.cpp
@@ -10,7 +10,7 @@
 #include "4C_fem_condition_utils.hpp"
 #include "4C_fem_discretization.hpp"
 #include "4C_fem_dofset_base.hpp"
-#include "4C_geometric_search_matchingoctree.hpp"
+#include "4C_fem_geometric_search_matchingoctree.hpp"
 #include "4C_linalg_utils_sparse_algebra_manipulation.hpp"
 
 FOUR_C_NAMESPACE_OPEN
diff --git a/src/core/fem/src/dofset/4C_fem_dofset_merged_wrapper.cpp b/src/core/fem/src/dofset/4C_fem_dofset_merged_wrapper.cpp
@@ -8,7 +8,7 @@
 #include "4C_fem_dofset_merged_wrapper.hpp"
 
 #include "4C_fem_condition_utils.hpp"
-#include "4C_geometric_search_matchingoctree.hpp"
+#include "4C_fem_geometric_search_matchingoctree.hpp"
 #include "4C_linalg_utils_sparse_algebra_manipulation.hpp"
 
 #include <Epetra_Export.h>
diff --git a/src/core/fem/src/general/element/4C_fem_general_element.cpp b/src/core/fem/src/general/element/4C_fem_general_element.cpp
@@ -12,8 +12,8 @@
 #include "4C_fem_condition.hpp"
 #include "4C_fem_discretization.hpp"
 #include "4C_fem_general_node.hpp"
-#include "4C_geometric_search_bounding_volume.hpp"
-#include "4C_geometric_search_params.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_params.hpp"
 #include "4C_io_element_append_visualization.hpp"
 #include "4C_material_base.hpp"
 #include "4C_utils_exceptions.hpp"
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_access_traits.hpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_access_traits.hpp
@@ -5,12 +5,12 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#ifndef FOUR_C_GEOMETRIC_SEARCH_ACCESS_TRAITS_HPP
-#define FOUR_C_GEOMETRIC_SEARCH_ACCESS_TRAITS_HPP
+#ifndef FOUR_C_FEM_GEOMETRIC_SEARCH_ACCESS_TRAITS_HPP
+#define FOUR_C_FEM_GEOMETRIC_SEARCH_ACCESS_TRAITS_HPP
 
 #include "4C_config.hpp"
 
-#include "4C_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
 
 #ifdef FOUR_C_WITH_ARBORX
 #include <ArborX.hpp>
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_bounding_volume.hpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_bounding_volume.hpp
@@ -5,8 +5,8 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#ifndef FOUR_C_GEOMETRIC_SEARCH_BOUNDING_VOLUME_HPP
-#define FOUR_C_GEOMETRIC_SEARCH_BOUNDING_VOLUME_HPP
+#ifndef FOUR_C_FEM_GEOMETRIC_SEARCH_BOUNDING_VOLUME_HPP
+#define FOUR_C_FEM_GEOMETRIC_SEARCH_BOUNDING_VOLUME_HPP
 
 #include "4C_config.hpp"
 
@@ -18,9 +18,7 @@
 #endif
 
 #ifdef FOUR_C_WITH_ARBORX
-
 FOUR_C_NAMESPACE_OPEN
-
 namespace Core::GeometricSearch
 {
   //! kdop_directions is the number of directions defining the possible faces of the k-DOP. In this
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_bvh.cpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_bvh.cpp
@@ -5,11 +5,11 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include "4C_geometric_search_bvh.hpp"
+#include "4C_fem_geometric_search_bvh.hpp"
 
-#include "4C_geometric_search_access_traits.hpp"
-#include "4C_geometric_search_bounding_volume.hpp"
-#include "4C_geometric_search_utils.hpp"
+#include "4C_fem_geometric_search_access_traits.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_utils.hpp"
 #include "4C_io_pstream.hpp"
 
 #include <Teuchos_TimeMonitor.hpp>
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_bvh.hpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_bvh.hpp
@@ -5,8 +5,8 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#ifndef FOUR_C_GEOMETRIC_SEARCH_BVH_HPP
-#define FOUR_C_GEOMETRIC_SEARCH_BVH_HPP
+#ifndef FOUR_C_FEM_GEOMETRIC_SEARCH_BVH_HPP
+#define FOUR_C_FEM_GEOMETRIC_SEARCH_BVH_HPP
 
 #include "4C_config.hpp"
 
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_distributed_tree.cpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_distributed_tree.cpp
@@ -5,12 +5,12 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include "4C_geometric_search_distributed_tree.hpp"
+#include "4C_fem_geometric_search_distributed_tree.hpp"
 
 #include "4C_comm_mpi_utils.hpp"
-#include "4C_geometric_search_access_traits.hpp"
-#include "4C_geometric_search_bounding_volume.hpp"
-#include "4C_geometric_search_utils.hpp"
+#include "4C_fem_geometric_search_access_traits.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_utils.hpp"
 
 #include <Teuchos_TimeMonitor.hpp>
 
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_distributed_tree.hpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_distributed_tree.hpp
@@ -5,16 +5,17 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#ifndef FOUR_C_GEOMETRIC_SEARCH_DISTRIBUTED_TREE_HPP
-#define FOUR_C_GEOMETRIC_SEARCH_DISTRIBUTED_TREE_HPP
+#ifndef FOUR_C_FEM_GEOMETRIC_SEARCH_DISTRIBUTED_TREE_HPP
+#define FOUR_C_FEM_GEOMETRIC_SEARCH_DISTRIBUTED_TREE_HPP
 
 #include "4C_config.hpp"
 
-#include "4C_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
 #include "4C_io_pstream.hpp"
 
 #include <vector>
 
+
 FOUR_C_NAMESPACE_OPEN
 
 namespace Core::GeometricSearch
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_matchingoctree.cpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_matchingoctree.cpp
@@ -5,7 +5,7 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include "4C_geometric_search_matchingoctree.hpp"
+#include "4C_fem_geometric_search_matchingoctree.hpp"
 
 #include "4C_comm_exporter.hpp"
 #include "4C_comm_mpi_utils.hpp"
@@ -15,6 +15,7 @@
 
 FOUR_C_NAMESPACE_OPEN
 
+
 /*----------------------------------------------------------------------*/
 /*----------------------------------------------------------------------*/
 Core::GeometricSearch::MatchingOctree::MatchingOctree()
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_matchingoctree.hpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_matchingoctree.hpp
@@ -5,8 +5,8 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#ifndef FOUR_C_GEOMETRIC_SEARCH_MATCHINGOCTREE_HPP
-#define FOUR_C_GEOMETRIC_SEARCH_MATCHINGOCTREE_HPP
+#ifndef FOUR_C_FEM_GEOMETRIC_SEARCH_MATCHINGOCTREE_HPP
+#define FOUR_C_FEM_GEOMETRIC_SEARCH_MATCHINGOCTREE_HPP
 
 #include "4C_config.hpp"
 
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_params.cpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_params.cpp
@@ -5,7 +5,7 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include "4C_geometric_search_params.hpp"
+#include "4C_fem_geometric_search_params.hpp"
 
 #include "4C_utils_parameter_list.hpp"
 
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_params.hpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_params.hpp
@@ -5,8 +5,8 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#ifndef FOUR_C_GEOMETRIC_SEARCH_PARAMS_HPP
-#define FOUR_C_GEOMETRIC_SEARCH_PARAMS_HPP
+#ifndef FOUR_C_FEM_GEOMETRIC_SEARCH_PARAMS_HPP
+#define FOUR_C_FEM_GEOMETRIC_SEARCH_PARAMS_HPP
 
 #include "4C_config.hpp"
 
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_utils.cpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_utils.cpp
@@ -5,10 +5,10 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include "4C_geometric_search_utils.hpp"
+#include "4C_fem_geometric_search_utils.hpp"
 
 #include "4C_comm_mpi_utils.hpp"
-#include "4C_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
 #include "4C_io_pstream.hpp"
 #include "4C_linalg_fixedsizematrix.hpp"
 #include "4C_linalg_utils_densematrix_inverse.hpp"
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_utils.hpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_utils.hpp
@@ -5,12 +5,12 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#ifndef FOUR_C_GEOMETRIC_SEARCH_UTILS_HPP
-#define FOUR_C_GEOMETRIC_SEARCH_UTILS_HPP
+#ifndef FOUR_C_FEM_GEOMETRIC_SEARCH_UTILS_HPP
+#define FOUR_C_FEM_GEOMETRIC_SEARCH_UTILS_HPP
 
 #include "4C_config.hpp"
 
-#include "4C_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
 
 #include <mpi.h>
 
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_visualization.cpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_visualization.cpp
@@ -5,10 +5,10 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include "4C_geometric_search_visualization.hpp"
+#include "4C_fem_geometric_search_visualization.hpp"
 
 #include "4C_comm_mpi_utils.hpp"
-#include "4C_geometric_search_utils.hpp"
+#include "4C_fem_geometric_search_utils.hpp"
 #include "4C_io_visualization_utils.hpp"
 
 #include <utility>
diff --git a/src/core/fem/src/geometric_search/4C_fem_geometric_search_visualization.hpp b/src/core/fem/src/geometric_search/4C_fem_geometric_search_visualization.hpp
@@ -5,12 +5,12 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#ifndef FOUR_C_GEOMETRIC_SEARCH_VISUALIZATION_HPP
-#define FOUR_C_GEOMETRIC_SEARCH_VISUALIZATION_HPP
+#ifndef FOUR_C_FEM_GEOMETRIC_SEARCH_VISUALIZATION_HPP
+#define FOUR_C_FEM_GEOMETRIC_SEARCH_VISUALIZATION_HPP
 
 #include "4C_config.hpp"
 
-#include "4C_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
 #include "4C_io_visualization_manager.hpp"
 
 #include <vector>
diff --git a/src/core/fem/src/geometric_search/CMakeLists.txt b/src/core/fem/src/geometric_search/CMakeLists.txt
diff --git a/src/core/fem/src/geometric_search/script/kdop_generate_possible_intersection_planes.wls b/src/core/fem/src/geometric_search/script/kdop_generate_possible_intersection_planes.wls
diff --git a/src/core/fem/tests/CMakeLists.txt b/src/core/fem/tests/CMakeLists.txt
@@ -5,6 +5,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+add_subdirectory(geometric_search)
 add_subdirectory(geometry)
 add_subdirectory(general)
 add_subdirectory(utils)
diff --git a/src/core/fem/tests/geometric_search/4C_fem_geometric_search_create_bounding_volumes_test.hpp b/src/core/fem/tests/geometric_search/4C_fem_geometric_search_create_bounding_volumes_test.hpp
@@ -5,14 +5,14 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#ifndef FOUR_C_GEOMETRIC_SEARCH_CREATE_BOUNDING_VOLUMES_TEST_HPP
-#define FOUR_C_GEOMETRIC_SEARCH_CREATE_BOUNDING_VOLUMES_TEST_HPP
+#ifndef FOUR_C_FEM_GEOMETRIC_SEARCH_CREATE_BOUNDING_VOLUMES_TEST_HPP
+#define FOUR_C_FEM_GEOMETRIC_SEARCH_CREATE_BOUNDING_VOLUMES_TEST_HPP
 
 #include "4C_config.hpp"
 
 #ifdef FOUR_C_WITH_ARBORX
 
-#include "4C_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
 #include "4C_linalg_fixedsizematrix.hpp"
 
 FOUR_C_NAMESPACE_OPEN
diff --git a/src/core/fem/tests/geometric_search/4C_fem_geometric_search_distributed_test.np3.cpp b/src/core/fem/tests/geometric_search/4C_fem_geometric_search_distributed_test.np3.cpp
@@ -16,8 +16,9 @@
 
 #ifdef FOUR_C_WITH_ARBORX
 
-#include "4C_geometric_search_create_bounding_volumes_test.hpp"
-#include "4C_geometric_search_distributed_tree.hpp"
+#include "4C_fem_geometric_search_create_bounding_volumes_test.hpp"
+#include "4C_fem_geometric_search_distributed_tree.hpp"
+
 
 namespace
 {
diff --git a/src/core/fem/tests/geometric_search/4C_fem_geometric_search_test.cpp b/src/core/fem/tests/geometric_search/4C_fem_geometric_search_test.cpp
@@ -9,13 +9,16 @@
 
 #include "4C_config.hpp"
 
-#include "4C_geometric_search_bounding_volume.hpp"
-#include "4C_geometric_search_utils.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_utils.hpp"
+
 
 #ifdef FOUR_C_WITH_ARBORX
 
-#include "4C_geometric_search_bvh.hpp"
-#include "4C_geometric_search_create_bounding_volumes_test.hpp"
+#include "4C_fem_geometric_search_bvh.hpp"
+#include "4C_fem_geometric_search_create_bounding_volumes_test.hpp"
+#include "4C_fem_geometric_search_utils.hpp"
+
 
 namespace
 {
diff --git a/src/core/fem/tests/geometric_search/CMakeLists.txt b/src/core/fem/tests/geometric_search/CMakeLists.txt
diff --git a/src/core/geometric_search/src/CMakeLists.txt b/src/core/geometric_search/src/CMakeLists.txt
diff --git a/src/core/rebalance/src/4C_rebalance_binning_based.cpp b/src/core/rebalance/src/4C_rebalance_binning_based.cpp
@@ -11,7 +11,7 @@
 #include "4C_fem_discretization.hpp"
 #include "4C_fem_general_node.hpp"
 #include "4C_fem_general_utils_createdis.hpp"
-#include "4C_geometric_search_matchingoctree.hpp"
+#include "4C_fem_geometric_search_matchingoctree.hpp"
 #include "4C_linalg_utils_densematrix_communication.hpp"
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 #include "4C_linalg_utils_sparse_algebra_manipulation.hpp"
diff --git a/src/core/rebalance/src/4C_rebalance_graph_based.cpp b/src/core/rebalance/src/4C_rebalance_graph_based.cpp
@@ -10,9 +10,9 @@
 #include "4C_fem_discretization.hpp"
 #include "4C_fem_general_element.hpp"
 #include "4C_fem_general_node.hpp"
-#include "4C_geometric_search_bounding_volume.hpp"
-#include "4C_geometric_search_distributed_tree.hpp"
-#include "4C_geometric_search_params.hpp"
+#include "4C_fem_geometric_search_bounding_volume.hpp"
+#include "4C_fem_geometric_search_distributed_tree.hpp"
+#include "4C_fem_geometric_search_params.hpp"
 #include "4C_linalg_utils_sparse_algebra_assemble.hpp"
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 #include "4C_linalg_utils_sparse_algebra_manipulation.hpp"
diff --git a/src/core/rebalance/src/4C_rebalance_graph_based.hpp b/src/core/rebalance/src/4C_rebalance_graph_based.hpp
@@ -10,12 +10,14 @@
 
 #include "4C_config.hpp"
 
-#include "4C_geometric_search_params.hpp"
+#include "4C_fem_geometric_search_params.hpp"
 #include "4C_linalg_graph.hpp"
 #include "4C_linalg_map.hpp"
 #include "4C_linalg_multi_vector.hpp"
 #include "4C_utils_parameter_list.fwd.hpp"
 
+#include <Teuchos_RCPDecl.hpp>
+
 #include <memory>
 
 FOUR_C_NAMESPACE_OPEN
diff --git a/src/coupling/src/adapter/4C_coupling_adapter.cpp b/src/coupling/src/adapter/4C_coupling_adapter.cpp
diff --git a/src/fluid_turbulence/4C_fluid_turbulence_transfer_turb_inflow.cpp b/src/fluid_turbulence/4C_fluid_turbulence_transfer_turb_inflow.cpp
diff --git a/src/inpar/4C_inpar_geometric_search.cpp b/src/inpar/4C_inpar_geometric_search.cpp
diff --git a/src/inpar/4C_inpar_geometric_search.hpp b/src/inpar/4C_inpar_geometric_search.hpp
diff --git a/src/inpar/4C_inpar_validparameters.cpp b/src/inpar/4C_inpar_validparameters.cpp
diff --git a/src/rigidsphere/4C_rigidsphere_evaluate.cpp b/src/rigidsphere/4C_rigidsphere_evaluate.cpp
diff --git a/src/ssi/4C_ssi_utils.cpp b/src/ssi/4C_ssi_utils.cpp
