diff --git a/tests/regression_tests/cpp_driver/inputs_true1.dat b/tests/regression_tests/cpp_driver/inputs_true1.dat
deleted file mode 100644
index fae59e202e..0000000000
--- a/tests/regression_tests/cpp_driver/inputs_true1.dat
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
- |
- |
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- eigenvalue
- 100
- 10
- 1
-
-
- -0.63 -0.63 -1 0.63 0.63 1
-
-
-
diff --git a/tests/regression_tests/cpp_driver/inputs_true2.dat b/tests/regression_tests/cpp_driver/inputs_true2.dat
deleted file mode 100644
index 728491d778..0000000000
--- a/tests/regression_tests/cpp_driver/inputs_true2.dat
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
- |
- |
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- eigenvalue
- 100
- 10
- 1
-
-
- -0.63 -0.63 -1 0.63 0.63 1
-
-
-
-
-
-
- 4 5 6
-
-
- 2
- flux
-
-
diff --git a/tests/regression_tests/cpp_driver/results_true.dat b/tests/regression_tests/cpp_driver/results_true.dat
index 32a636636a..c7b247e59e 100644
--- a/tests/regression_tests/cpp_driver/results_true.dat
+++ b/tests/regression_tests/cpp_driver/results_true.dat
@@ -1,9 +1,9 @@
k-combined:
-1.141180E+00 4.513757E-02
+1.108161E+00 3.345885E-02
tally 1:
-1.220313E+02
-1.659250E+03
-4.421703E+01
-2.178300E+02
-2.356492E+02
-6.182509E+03
+1.178481E+02
+1.548363E+03
+4.198718E+01
+1.962188E+02
+2.252008E+02
+5.647830E+03
diff --git a/tests/regression_tests/cpp_driver/test.py b/tests/regression_tests/cpp_driver/test.py
index a562f895ea..4225e5a735 100644
--- a/tests/regression_tests/cpp_driver/test.py
+++ b/tests/regression_tests/cpp_driver/test.py
@@ -7,11 +7,11 @@ import textwrap
import openmc
import pytest
+from tests.regression_tests import config
from tests.testing_harness import PyAPITestHarness
-
@pytest.fixture
-def driver(request):
+def cpp_driver(request):
"""Compile the external source"""
# Get build directory and write CMakeLists.txt file
@@ -40,16 +40,6 @@ def driver(request):
# Remove local build directory when test is complete
shutil.rmtree('build')
-
-@pytest.fixture
-def model():
- model = openmc.examples.pwr_pin_cell()
- model.settings.particles = 100
- model.settings.batches = 10
- model.settings.inactive = 1
- return model
-
-
class ExternalDriverTestHarness(PyAPITestHarness):
def __init__(self, executable, statepoint_name, model=None):
@@ -57,10 +47,20 @@ class ExternalDriverTestHarness(PyAPITestHarness):
self.executable = executable
def _run_openmc(self):
- print("Running openmc")
- openmc.run(openmc_exec=self.executable)
+ if config['mpi']:
+ mpi_args = [config['mpiexec'], '-n', config['mpi_np']]
+ openmc.run(openmc_exec=self.executable,
+ mpi_args=mpi_args,
+ event_based=config['event'])
+ else:
+ openmc.run(openmc_exec=self.executable,
+ event_based=config['event'])
+def test_cpp_driver(cpp_driver):
+ model = openmc.examples.pwr_pin_cell()
+ model.settings.particles = 100
+ model.settings.batches = 10
+ model.settings.inactive = 1
-def test_cpp_driver(driver, model):
- harness = ExternalDriverTestHarness(driver, 'statepoint.10.h5', model)
+ harness = ExternalDriverTestHarness(cpp_driver, 'statepoint.10.h5', model)
harness.main()