From cb3f878d1184ed45c90e5b7c5c0d18e4e4dee421 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Sun, 16 Jun 2019 22:02:03 -0500 Subject: [PATCH] Renaming test. Altering includes in surface/cell.h to isolate external package includes. --- include/openmc/cell.h | 2 -- include/openmc/surface.h | 5 +---- tests/regression_tests/dagmc/refl/test.py | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/openmc/cell.h b/include/openmc/cell.h index 080dac345..ee1230595 100644 --- a/include/openmc/cell.h +++ b/include/openmc/cell.h @@ -10,9 +10,7 @@ #include "hdf5.h" #include "pugixml.hpp" -#ifdef DAGMC #include "dagmc.h" -#endif #include "openmc/constants.h" #include "openmc/neighbor_list.h" diff --git a/include/openmc/surface.h b/include/openmc/surface.h index 6fd0a73ae..7b0ccefd1 100644 --- a/include/openmc/surface.h +++ b/include/openmc/surface.h @@ -12,10 +12,7 @@ #include "openmc/constants.h" #include "openmc/position.h" - -#ifdef DAGMC -#include "DagMC.hpp" -#endif +#include "dagmc.h" namespace openmc { diff --git a/tests/regression_tests/dagmc/refl/test.py b/tests/regression_tests/dagmc/refl/test.py index 885b83766..93104f1d0 100644 --- a/tests/regression_tests/dagmc/refl/test.py +++ b/tests/regression_tests/dagmc/refl/test.py @@ -35,6 +35,6 @@ class UWUWTest(PyAPITestHarness): model.tallies.export_to_xml() -def test_uwuw(): +def test_refl(): harness = UWUWTest('statepoint.5.h5') harness.main()