From 09546c2276c379f76fff38fcba4d59f211c56102 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Sun, 28 Jun 2015 13:49:51 -0600 Subject: [PATCH] Fixed MPI exec error for TestHarness #402 --- tests/.testing_harness.py.swp | Bin 0 -> 24576 bytes tests/test_source_file/test_source_file.py | 2 +- .../test_statepoint_restart.py | 2 +- tests/testing_harness.py | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 tests/.testing_harness.py.swp diff --git a/tests/.testing_harness.py.swp b/tests/.testing_harness.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..72fea4fb0b41e21cfcbc7d0873488ef11ba9924f GIT binary patch literal 24576 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 F{tE^!8H4}; literal 0 HcmV?d00001 diff --git a/tests/test_source_file/test_source_file.py b/tests/test_source_file/test_source_file.py index af998ee339..cc146e5c9f 100644 --- a/tests/test_source_file/test_source_file.py +++ b/tests/test_source_file/test_source_file.py @@ -67,7 +67,7 @@ class SourceFileTestHarness(TestHarness): def _run_openmc_restart(self): # Get the number of MPI processes. if self._opts.mpi_exec: - mpi_procs = self._opts.mpi_np + mpi_procs = int(self._opts.mpi_np) else: mpi_procs = 1 diff --git a/tests/test_statepoint_restart/test_statepoint_restart.py b/tests/test_statepoint_restart/test_statepoint_restart.py index c62eb67df4..8d960128dd 100644 --- a/tests/test_statepoint_restart/test_statepoint_restart.py +++ b/tests/test_statepoint_restart/test_statepoint_restart.py @@ -26,7 +26,7 @@ class StatepointRestartTestHarness(TestHarness): def _run_openmc_restart(self): # Get the number of MPI processes. if self._opts.mpi_exec: - mpi_procs = self._opts.mpi_np + mpi_procs = int(self._opts.mpi_np) else: mpi_procs = 1 diff --git a/tests/testing_harness.py b/tests/testing_harness.py index 99f2917d80..997052cfd0 100644 --- a/tests/testing_harness.py +++ b/tests/testing_harness.py @@ -45,7 +45,7 @@ class TestHarness(object): def _run_openmc(self): if self._opts.mpi_exec: - mpi_procs = self._opts.mpi_np + mpi_procs = int(self._opts.mpi_np) else: mpi_procs = 1