diff --git a/src/dagmc/DagMC.cpp b/src/dagmc/DagMC.cpp index 83c97634d8..8f92ca8672 100644 --- a/src/dagmc/DagMC.cpp +++ b/src/dagmc/DagMC.cpp @@ -811,12 +811,14 @@ ErrorCode DagMC::point_in_volume_slow(EntityHandle volume, const double xyz[3], return rval; } +#if MOAB_VERSION_MAJOR == 5 && MOAB_VERSION_MINOR > 2 // find a which volume contains the current point ErrorCode DagMC::find_volume(const double xyz[3], EntityHandle& volume, const double* uvw) { ErrorCode rval = ray_tracer->find_volume(xyz, volume, uvw); return rval; } +#endif // detemine distance to nearest surface ErrorCode DagMC::closest_to_location(EntityHandle volume, diff --git a/src/dagmc/DagMC.hpp b/src/dagmc/DagMC.hpp index 85f0d51410..3273eafb88 100644 --- a/src/dagmc/DagMC.hpp +++ b/src/dagmc/DagMC.hpp @@ -225,9 +225,10 @@ class DagMC { ErrorCode point_in_volume_slow(const EntityHandle volume, const double xyz[3], int& result); - +#if MOAB_VERSION_MAJOR == 5 && MOAB_VERSION_MINOR > 2 ErrorCode find_volume(const double xyz[3], EntityHandle& volume, const double* uvw = NULL); +#endif ErrorCode test_volume_boundary(const EntityHandle volume, const EntityHandle surface, diff --git a/src/dagmc/tests/dagmc_simple_test.cpp b/src/dagmc/tests/dagmc_simple_test.cpp index a7ff3cb0b0..ee1525a524 100644 --- a/src/dagmc/tests/dagmc_simple_test.cpp +++ b/src/dagmc/tests/dagmc_simple_test.cpp @@ -156,6 +156,7 @@ TEST_F(DagmcSimpleTest, dagmc_point_in) { EXPECT_EQ(expect_result, result); } +#if MOAB_VERSION_MAJOR == 5 && MOAB_VERSION_MINOR > 2 TEST_F(DagmcSimpleTest, dagmc_find_volume) { int vol_idx = 1; int vol_dim = 3; @@ -166,6 +167,7 @@ TEST_F(DagmcSimpleTest, dagmc_find_volume) { EXPECT_EQ(rval, MB_SUCCESS); EXPECT_EQ(expected_vol_h, vol_h); } +#endif TEST_F(DagmcSimpleTest, dagmc_test_obb_retreval_rayfire) { // make new dagmc