From: David Wells <drwells@email.unc.edu>
Date: Mon, 8 Mar 2021 14:54:51 +0000 (-0500)
Subject: Merge pull request #11497 from Rombur/arborx
X-Git-Tag: v9.3.0-rc1~364
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d62c79c696015901f8a8372170661998a2b621c1;p=dealii.git

Merge pull request #11497 from Rombur/arborx

Add new BVH class
---

d62c79c696015901f8a8372170661998a2b621c1
diff --cc include/deal.II/base/config.h.in
index 15b9d8aada,23fe3f3b80..116697c2b6
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@@ -41,9 -42,10 +42,10 @@@
  #cmakedefine DEAL_II_WITH_COMPLEX_VALUES
  #cmakedefine DEAL_II_WITH_CUDA
  #cmakedefine DEAL_II_WITH_GINKGO
 -#cmakedefine DEAL_II_WITH_GSL
  #cmakedefine DEAL_II_WITH_GMSH
 +#cmakedefine DEAL_II_WITH_GSL
  #cmakedefine DEAL_II_WITH_HDF5
+ #cmakedefine DEAL_II_WITH_KOKKOS
  #cmakedefine DEAL_II_WITH_LAPACK
  #cmakedefine LAPACK_WITH_64BIT_BLAS_INDICES
  #cmakedefine DEAL_II_LAPACK_WITH_MKL
diff --cc source/CMakeLists.txt
index 7173d25b85,460d78fa34..c41a4c2ca5
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@@ -71,7 -71,9 +71,8 @@@ ADD_SUBDIRECTORY(differentiation
  ADD_SUBDIRECTORY(physics)
  ADD_SUBDIRECTORY(optimization/rol)
  ADD_SUBDIRECTORY(non_matching)
 -ADD_SUBDIRECTORY(simplex)
  ADD_SUBDIRECTORY(sundials)
+ ADD_SUBDIRECTORY(arborx)
  
  FOREACH(build ${DEAL_II_BUILD_TYPES})
    STRING(TOLOWER ${build} build_lowercase)