From 776fc48b7e32c939d850809ee09b236336005079 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 8 Nov 2018 13:19:00 -0600 Subject: [PATCH] Removing xml dagmc test. --- .../{ => dagmc}/dagmc_py/__init__.py | 0 .../{dagmc_xml => dagmc/dagmc_py}/dagmc.h5m | Bin .../{ => dagmc}/dagmc_py/inputs_true.dat | 0 .../{ => dagmc}/dagmc_py/results_true.dat | 0 .../{ => dagmc}/dagmc_py/test.py | 0 tests/regression_tests/dagmc_py/dagmc.h5m | 1 - tests/regression_tests/dagmc_xml/__init__.py | 0 tests/regression_tests/dagmc_xml/materials.xml | 16 ---------------- .../regression_tests/dagmc_xml/results_true.dat | 5 ----- tests/regression_tests/dagmc_xml/settings.xml | 16 ---------------- tests/regression_tests/dagmc_xml/tallies.xml | 13 ------------- tests/regression_tests/dagmc_xml/test.py | 12 ------------ 12 files changed, 63 deletions(-) rename tests/regression_tests/{ => dagmc}/dagmc_py/__init__.py (100%) rename tests/regression_tests/{dagmc_xml => dagmc/dagmc_py}/dagmc.h5m (100%) rename tests/regression_tests/{ => dagmc}/dagmc_py/inputs_true.dat (100%) rename tests/regression_tests/{ => dagmc}/dagmc_py/results_true.dat (100%) rename tests/regression_tests/{ => dagmc}/dagmc_py/test.py (100%) delete mode 120000 tests/regression_tests/dagmc_py/dagmc.h5m delete mode 100644 tests/regression_tests/dagmc_xml/__init__.py delete mode 100644 tests/regression_tests/dagmc_xml/materials.xml delete mode 100644 tests/regression_tests/dagmc_xml/results_true.dat delete mode 100644 tests/regression_tests/dagmc_xml/settings.xml delete mode 100644 tests/regression_tests/dagmc_xml/tallies.xml delete mode 100644 tests/regression_tests/dagmc_xml/test.py diff --git a/tests/regression_tests/dagmc_py/__init__.py b/tests/regression_tests/dagmc/dagmc_py/__init__.py similarity index 100% rename from tests/regression_tests/dagmc_py/__init__.py rename to tests/regression_tests/dagmc/dagmc_py/__init__.py diff --git a/tests/regression_tests/dagmc_xml/dagmc.h5m b/tests/regression_tests/dagmc/dagmc_py/dagmc.h5m similarity index 100% rename from tests/regression_tests/dagmc_xml/dagmc.h5m rename to tests/regression_tests/dagmc/dagmc_py/dagmc.h5m diff --git a/tests/regression_tests/dagmc_py/inputs_true.dat b/tests/regression_tests/dagmc/dagmc_py/inputs_true.dat similarity index 100% rename from tests/regression_tests/dagmc_py/inputs_true.dat rename to tests/regression_tests/dagmc/dagmc_py/inputs_true.dat diff --git a/tests/regression_tests/dagmc_py/results_true.dat b/tests/regression_tests/dagmc/dagmc_py/results_true.dat similarity index 100% rename from tests/regression_tests/dagmc_py/results_true.dat rename to tests/regression_tests/dagmc/dagmc_py/results_true.dat diff --git a/tests/regression_tests/dagmc_py/test.py b/tests/regression_tests/dagmc/dagmc_py/test.py similarity index 100% rename from tests/regression_tests/dagmc_py/test.py rename to tests/regression_tests/dagmc/dagmc_py/test.py diff --git a/tests/regression_tests/dagmc_py/dagmc.h5m b/tests/regression_tests/dagmc_py/dagmc.h5m deleted file mode 120000 index 810fe92555..0000000000 --- a/tests/regression_tests/dagmc_py/dagmc.h5m +++ /dev/null @@ -1 +0,0 @@ -../dagmc_xml/dagmc.h5m \ No newline at end of file diff --git a/tests/regression_tests/dagmc_xml/__init__.py b/tests/regression_tests/dagmc_xml/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/regression_tests/dagmc_xml/materials.xml b/tests/regression_tests/dagmc_xml/materials.xml deleted file mode 100644 index af1b505db2..0000000000 --- a/tests/regression_tests/dagmc_xml/materials.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/regression_tests/dagmc_xml/results_true.dat b/tests/regression_tests/dagmc_xml/results_true.dat deleted file mode 100644 index fc13a9cdaf..0000000000 --- a/tests/regression_tests/dagmc_xml/results_true.dat +++ /dev/null @@ -1,5 +0,0 @@ -k-combined: -1.115067E+00 5.423808E-02 -tally 1: -8.543144E+00 -1.530584E+01 diff --git a/tests/regression_tests/dagmc_xml/settings.xml b/tests/regression_tests/dagmc_xml/settings.xml deleted file mode 100644 index 5083623787..0000000000 --- a/tests/regression_tests/dagmc_xml/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - eigenvalue - true - 5 - 0 - 100 - - - - -4 -4 -4 4 4 4 - - - - diff --git a/tests/regression_tests/dagmc_xml/tallies.xml b/tests/regression_tests/dagmc_xml/tallies.xml deleted file mode 100644 index 9b8b00cd63..0000000000 --- a/tests/regression_tests/dagmc_xml/tallies.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - 1 - - - - 1 - total - - - diff --git a/tests/regression_tests/dagmc_xml/test.py b/tests/regression_tests/dagmc_xml/test.py deleted file mode 100644 index 9817cff956..0000000000 --- a/tests/regression_tests/dagmc_xml/test.py +++ /dev/null @@ -1,12 +0,0 @@ -from tests.testing_harness import TestHarness -import os -import pytest -import openmc.capi - -pytestmark = pytest.mark.skipif( - not openmc.capi.dagmc_enabled, - reason="DAGMC CAD geometry is not enabled.") - -def test_dagmc(): - harness = TestHarness('statepoint.5.h5') - harness.main()