Add new search option, kdtree

* stk_kdtree search option is now available * xfer change
NaluCFD · Oct 12, 2016 · 636a674 · 636a674
1 parent 16e309a
commit 636a674
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/src/ActuatorLine.C b/src/ActuatorLine.C
@@ -241,6 +241,8 @@ ActuatorLine::load(
       searchMethod_ = stk::search::BOOST_RTREE;
     else if ( searchMethodName == "stk_octree" )
       searchMethod_ = stk::search::OCTREE;
+    else if ( searchMethodName == "stk_kdtree" )
+      searchMethod_ = stk::search::KDTREE;
     else
       NaluEnv::self().naluOutputP0() << "ActuatorLine::search method not declared; will use BOOST_RTREE" << std::endl;
 

diff --git a/src/ContactInfo.C b/src/ContactInfo.C
@@ -73,6 +73,8 @@ ContactInfo::ContactInfo(
     searchMethod_ = stk::search::BOOST_RTREE;
   else if ( searchMethodName == "stk_octree" )
     searchMethod_ = stk::search::OCTREE;
+  else if ( searchMethodName == "stk_kdtree" )
+    searchMethod_ = stk::search::KDTREE;
   else
     NaluEnv::self().naluOutputP0() << "ContactInfo::search method not declared; will use BOOST_RTREE" << std::endl;
 

diff --git a/src/NonConformalInfo.C b/src/NonConformalInfo.C
@@ -93,6 +93,8 @@ NonConformalInfo::NonConformalInfo(
     searchMethod_ = stk::search::BOOST_RTREE;
   else if ( searchMethodName == "stk_octree" )
     searchMethod_ = stk::search::OCTREE;
+  else if ( searchMethodName == "stk_kdtree" )
+    searchMethod_ = stk::search::KDTREE;
   else
     NaluEnv::self().naluOutputP0() << "NonConformalInfo::search method not declared; will use BOOST_RTREE" << std::endl;
 

diff --git a/src/PeriodicManager.C b/src/PeriodicManager.C
@@ -91,6 +91,8 @@ PeriodicManager::add_periodic_pair(
     searchMethod = stk::search::BOOST_RTREE;
   else if ( searchMethodName == "stk_octree" )
     searchMethod = stk::search::OCTREE;
+  else if ( searchMethodName == "stk_kdtree" )
+    searchMethod = stk::search::KDTREE;
   else
     NaluEnv::self().naluOutputP0() << "PeriodicManager::search method not declared; will use BOOST_RTREE" << std::endl;
   searchMethodVec_.push_back(searchMethod);

diff --git a/src/xfer/Transfer.C b/src/xfer/Transfer.C
@@ -361,6 +361,8 @@ void Transfer::allocate_stk_transfer() {
     searchMethod = stk::search::BOOST_RTREE;
   else if ( searchMethodName_ == "stk_octree" )
     searchMethod = stk::search::OCTREE;
+  else if ( searchMethodName_ == "stk_kdtree" )
+    searchMethod = stk::search::KDTREE;
   else
     NaluEnv::self().naluOutputP0() << "Transfer::search method not declared; will use BOOST_RTREE" << std::endl;
   transfer_.reset(new STKTransfer(from_mesh, to_mesh, name_, searchExpansionFactor_, searchMethod));