From acc7b2cf2490b2eca9ac54bfd2254b0537ebe602 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 22 May 2015 17:04:27 +0700 Subject: [PATCH] Fix openmc imports in tests and fix a few paths in run_test.py --- tests/run_tests.py | 18 +++++++++--------- tests/test_basic/results.py | 2 +- tests/test_cmfd_feed/results.py | 2 +- tests/test_cmfd_nofeed/results.py | 2 +- tests/test_confidence_intervals/results.py | 2 +- tests/test_density_atombcm/results.py | 2 +- tests/test_density_atomcm3/results.py | 2 +- tests/test_density_kgm3/results.py | 2 +- tests/test_density_sum/results.py | 2 +- tests/test_eigenvalue_genperbatch/results.py | 2 +- tests/test_eigenvalue_no_inactive/results.py | 2 +- tests/test_energy_grid/results.py | 2 +- tests/test_entropy/results.py | 2 +- tests/test_filter_cell/results.py | 2 +- tests/test_filter_cellborn/results.py | 2 +- tests/test_filter_distribcell/results.py | 2 +- tests/test_filter_energy/results.py | 2 +- tests/test_filter_energyout/results.py | 2 +- tests/test_filter_group_transfer/results.py | 2 +- tests/test_filter_material/results.py | 2 +- tests/test_filter_mesh_2d/results.py | 2 +- tests/test_filter_mesh_3d/results.py | 2 +- tests/test_filter_universe/results.py | 2 +- tests/test_fixed_source/results.py | 2 +- tests/test_infinite_cell/results.py | 2 +- tests/test_lattice/results.py | 2 +- tests/test_lattice_hex/results.py | 2 +- tests/test_lattice_mixed/results.py | 2 +- tests/test_lattice_multiple/results.py | 2 +- tests/test_natural_element/results.py | 2 +- tests/test_output/results.py | 2 +- tests/test_particle_restart_eigval/results.py | 2 +- tests/test_particle_restart_fixed/results.py | 2 +- tests/test_ptables_off/results.py | 2 +- tests/test_reflective_cone/results.py | 2 +- tests/test_reflective_cylinder/results.py | 2 +- tests/test_reflective_plane/results.py | 2 +- tests/test_reflective_sphere/results.py | 2 +- tests/test_resonance_scattering/results.py | 2 +- tests/test_rotation/results.py | 2 +- tests/test_salphabeta/results.py | 2 +- tests/test_salphabeta_multiple/results.py | 2 +- tests/test_score_MT/results.py | 2 +- tests/test_score_absorption/results.py | 2 +- tests/test_score_current/results.py | 2 +- tests/test_score_events/results.py | 2 +- tests/test_score_fission/results.py | 2 +- tests/test_score_flux/results.py | 2 +- tests/test_score_flux_yn/results.py | 2 +- tests/test_score_kappafission/results.py | 2 +- tests/test_score_nufission/results.py | 2 +- tests/test_score_nuscatter/results.py | 2 +- tests/test_score_nuscatter_n/results.py | 2 +- tests/test_score_nuscatter_pn/results.py | 2 +- tests/test_score_nuscatter_yn/results.py | 2 +- tests/test_score_scatter/results.py | 2 +- tests/test_score_scatter_n/results.py | 2 +- tests/test_score_scatter_pn/results.py | 2 +- tests/test_score_scatter_yn/results.py | 2 +- tests/test_score_total/results.py | 2 +- tests/test_score_total_yn/results.py | 2 +- tests/test_seed/results.py | 2 +- tests/test_source_angle_mono/results.py | 2 +- tests/test_source_energy_maxwell/results.py | 2 +- tests/test_source_energy_mono/results.py | 2 +- tests/test_source_file/results.py | 2 +- tests/test_source_point/results.py | 2 +- tests/test_sourcepoint_batch/results.py | 2 +- tests/test_sourcepoint_interval/results.py | 2 +- tests/test_sourcepoint_latest/results.py | 2 +- tests/test_sourcepoint_restart/results.py | 2 +- tests/test_statepoint_batch/results.py | 2 +- tests/test_statepoint_interval/results.py | 2 +- tests/test_statepoint_restart/results.py | 2 +- tests/test_statepoint_sourcesep/results.py | 2 +- tests/test_survival_biasing/results.py | 2 +- tests/test_tally_assumesep/results.py | 2 +- tests/test_tally_nuclides/results.py | 2 +- tests/test_trace/results.py | 2 +- tests/test_track_output/results.py | 2 +- tests/test_translation/results.py | 2 +- tests/test_trigger_batch_interval/results.py | 2 +- .../test_trigger_no_batch_interval/results.py | 2 +- tests/test_trigger_no_status/results.py | 2 +- tests/test_trigger_tallies/results.py | 2 +- tests/test_uniform_fs/results.py | 2 +- tests/test_union_energy_grids/results.py | 2 +- tests/test_universe/results.py | 2 +- tests/test_void/results.py | 2 +- 89 files changed, 97 insertions(+), 97 deletions(-) diff --git a/tests/run_tests.py b/tests/run_tests.py index 3a8296083..1679fa5c3 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py @@ -121,7 +121,7 @@ class Test(object): self.skipped = False self.valgrind_cmd = "" self.gcov_cmd = "" - self.cmake = ['cmake', '-H../src', '-Bbuild'] + self.cmake = ['cmake', '-H..', '-Bbuild'] # Check for MPI/HDF5 if self.mpi and not self.hdf5: @@ -345,15 +345,15 @@ else: script_mode = False # Setup CTest script vars. Not used in non-script mode -pwd = os.environ['PWD'] +pwd = os.getcwd() ctest_vars = { -'source_dir' : pwd + '/../src', -'build_dir' : pwd + '/build', -'host_name' : socket.gethostname(), -'dashboard' : dash, -'submit' : submit, -'update' : update, -'n_procs' : options.n_procs + 'source_dir': os.path.join(pwd, '..'), + 'build_dir': os.path.join(pwd, 'build'), + 'host_name': socket.gethostname(), + 'dashboard': dash, + 'submit': submit, + 'update': update, + 'n_procs': options.n_procs } # Check project name diff --git a/tests/test_basic/results.py b/tests/test_basic/results.py index 55087f58c..479a94833 100644 --- a/tests/test_basic/results.py +++ b/tests/test_basic/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_cmfd_feed/results.py b/tests/test_cmfd_feed/results.py index 869b785f3..577941c24 100644 --- a/tests/test_cmfd_feed/results.py +++ b/tests/test_cmfd_feed/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint import openmc diff --git a/tests/test_cmfd_nofeed/results.py b/tests/test_cmfd_nofeed/results.py index d22c2b2b4..4c8ea4444 100644 --- a/tests/test_cmfd_nofeed/results.py +++ b/tests/test_cmfd_nofeed/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint import openmc diff --git a/tests/test_confidence_intervals/results.py b/tests/test_confidence_intervals/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_confidence_intervals/results.py +++ b/tests/test_confidence_intervals/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_density_atombcm/results.py b/tests/test_density_atombcm/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_density_atombcm/results.py +++ b/tests/test_density_atombcm/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_density_atomcm3/results.py b/tests/test_density_atomcm3/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_density_atomcm3/results.py +++ b/tests/test_density_atomcm3/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_density_kgm3/results.py b/tests/test_density_kgm3/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_density_kgm3/results.py +++ b/tests/test_density_kgm3/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_density_sum/results.py b/tests/test_density_sum/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_density_sum/results.py +++ b/tests/test_density_sum/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_eigenvalue_genperbatch/results.py b/tests/test_eigenvalue_genperbatch/results.py index 6b61666a6..cb97c815f 100644 --- a/tests/test_eigenvalue_genperbatch/results.py +++ b/tests/test_eigenvalue_genperbatch/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_eigenvalue_no_inactive/results.py b/tests/test_eigenvalue_no_inactive/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_eigenvalue_no_inactive/results.py +++ b/tests/test_eigenvalue_no_inactive/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_energy_grid/results.py b/tests/test_energy_grid/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_energy_grid/results.py +++ b/tests/test_energy_grid/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_entropy/results.py b/tests/test_entropy/results.py index 843bf4631..a55f37a26 100644 --- a/tests/test_entropy/results.py +++ b/tests/test_entropy/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_filter_cell/results.py b/tests/test_filter_cell/results.py index e113be6d7..996a2b96d 100644 --- a/tests/test_filter_cell/results.py +++ b/tests/test_filter_cell/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_filter_cellborn/results.py b/tests/test_filter_cellborn/results.py index e113be6d7..996a2b96d 100644 --- a/tests/test_filter_cellborn/results.py +++ b/tests/test_filter_cellborn/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_filter_distribcell/results.py b/tests/test_filter_distribcell/results.py index a1dc38ebd..67997aafd 100644 --- a/tests/test_filter_distribcell/results.py +++ b/tests/test_filter_distribcell/results.py @@ -4,7 +4,7 @@ import sys import numpy as np # import statepoint -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') from openmc.statepoint import StatePoint from openmc import Filter diff --git a/tests/test_filter_energy/results.py b/tests/test_filter_energy/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_filter_energy/results.py +++ b/tests/test_filter_energy/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_filter_energyout/results.py b/tests/test_filter_energyout/results.py index 19cd4d9a3..7e6fe8909 100644 --- a/tests/test_filter_energyout/results.py +++ b/tests/test_filter_energyout/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_filter_group_transfer/results.py b/tests/test_filter_group_transfer/results.py index 19cd4d9a3..7e6fe8909 100644 --- a/tests/test_filter_group_transfer/results.py +++ b/tests/test_filter_group_transfer/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_filter_material/results.py b/tests/test_filter_material/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_filter_material/results.py +++ b/tests/test_filter_material/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_filter_mesh_2d/results.py b/tests/test_filter_mesh_2d/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_filter_mesh_2d/results.py +++ b/tests/test_filter_mesh_2d/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_filter_mesh_3d/results.py b/tests/test_filter_mesh_3d/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_filter_mesh_3d/results.py +++ b/tests/test_filter_mesh_3d/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_filter_universe/results.py b/tests/test_filter_universe/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_filter_universe/results.py +++ b/tests/test_filter_universe/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_fixed_source/results.py b/tests/test_fixed_source/results.py index 0e7a3e017..f39d73de6 100644 --- a/tests/test_fixed_source/results.py +++ b/tests/test_fixed_source/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_infinite_cell/results.py b/tests/test_infinite_cell/results.py index 9b8c89cd2..076b19411 100644 --- a/tests/test_infinite_cell/results.py +++ b/tests/test_infinite_cell/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_lattice/results.py b/tests/test_lattice/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_lattice/results.py +++ b/tests/test_lattice/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_lattice_hex/results.py b/tests/test_lattice_hex/results.py index ae613eee6..d5317232e 100644 --- a/tests/test_lattice_hex/results.py +++ b/tests/test_lattice_hex/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_lattice_mixed/results.py b/tests/test_lattice_mixed/results.py index dc021dc22..769d2761e 100644 --- a/tests/test_lattice_mixed/results.py +++ b/tests/test_lattice_mixed/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_lattice_multiple/results.py b/tests/test_lattice_multiple/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_lattice_multiple/results.py +++ b/tests/test_lattice_multiple/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_natural_element/results.py b/tests/test_natural_element/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_natural_element/results.py +++ b/tests/test_natural_element/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_output/results.py b/tests/test_output/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_output/results.py +++ b/tests/test_output/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_particle_restart_eigval/results.py b/tests/test_particle_restart_eigval/results.py index 2ff1ef2b8..192342e6d 100644 --- a/tests/test_particle_restart_eigval/results.py +++ b/tests/test_particle_restart_eigval/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import particle restart import openmc.particle_restart as pr diff --git a/tests/test_particle_restart_fixed/results.py b/tests/test_particle_restart_fixed/results.py index 6c9a40d5a..5cbbb0021 100644 --- a/tests/test_particle_restart_fixed/results.py +++ b/tests/test_particle_restart_fixed/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import particle restart import openmc.particle_restart as pr diff --git a/tests/test_ptables_off/results.py b/tests/test_ptables_off/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_ptables_off/results.py +++ b/tests/test_ptables_off/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_reflective_cone/results.py b/tests/test_reflective_cone/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_reflective_cone/results.py +++ b/tests/test_reflective_cone/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_reflective_cylinder/results.py b/tests/test_reflective_cylinder/results.py index 21e060889..b8e813daf 100644 --- a/tests/test_reflective_cylinder/results.py +++ b/tests/test_reflective_cylinder/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint import openmc.statepoint as statepoint diff --git a/tests/test_reflective_plane/results.py b/tests/test_reflective_plane/results.py index 21e060889..b8e813daf 100644 --- a/tests/test_reflective_plane/results.py +++ b/tests/test_reflective_plane/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint import openmc.statepoint as statepoint diff --git a/tests/test_reflective_sphere/results.py b/tests/test_reflective_sphere/results.py index 21e060889..b8e813daf 100644 --- a/tests/test_reflective_sphere/results.py +++ b/tests/test_reflective_sphere/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint import openmc.statepoint as statepoint diff --git a/tests/test_resonance_scattering/results.py b/tests/test_resonance_scattering/results.py index fdecf48f8..cd50adf18 100644 --- a/tests/test_resonance_scattering/results.py +++ b/tests/test_resonance_scattering/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_rotation/results.py b/tests/test_rotation/results.py index 21e060889..b8e813daf 100644 --- a/tests/test_rotation/results.py +++ b/tests/test_rotation/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint import openmc.statepoint as statepoint diff --git a/tests/test_salphabeta/results.py b/tests/test_salphabeta/results.py index 21e060889..b8e813daf 100644 --- a/tests/test_salphabeta/results.py +++ b/tests/test_salphabeta/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint import openmc.statepoint as statepoint diff --git a/tests/test_salphabeta_multiple/results.py b/tests/test_salphabeta_multiple/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_salphabeta_multiple/results.py +++ b/tests/test_salphabeta_multiple/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_MT/results.py b/tests/test_score_MT/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_score_MT/results.py +++ b/tests/test_score_MT/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_absorption/results.py b/tests/test_score_absorption/results.py index c6c923710..126eebb6e 100644 --- a/tests/test_score_absorption/results.py +++ b/tests/test_score_absorption/results.py @@ -4,7 +4,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_current/results.py b/tests/test_score_current/results.py index 40b65f9da..badc816d9 100644 --- a/tests/test_score_current/results.py +++ b/tests/test_score_current/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_events/results.py b/tests/test_score_events/results.py index 40b65f9da..badc816d9 100644 --- a/tests/test_score_events/results.py +++ b/tests/test_score_events/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_fission/results.py b/tests/test_score_fission/results.py index 40b65f9da..badc816d9 100644 --- a/tests/test_score_fission/results.py +++ b/tests/test_score_fission/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_flux/results.py b/tests/test_score_flux/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_score_flux/results.py +++ b/tests/test_score_flux/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_flux_yn/results.py b/tests/test_score_flux_yn/results.py index 40b65f9da..badc816d9 100644 --- a/tests/test_score_flux_yn/results.py +++ b/tests/test_score_flux_yn/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_kappafission/results.py b/tests/test_score_kappafission/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_score_kappafission/results.py +++ b/tests/test_score_kappafission/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_nufission/results.py b/tests/test_score_nufission/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_score_nufission/results.py +++ b/tests/test_score_nufission/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_nuscatter/results.py b/tests/test_score_nuscatter/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_score_nuscatter/results.py +++ b/tests/test_score_nuscatter/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_nuscatter_n/results.py b/tests/test_score_nuscatter_n/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_score_nuscatter_n/results.py +++ b/tests/test_score_nuscatter_n/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_nuscatter_pn/results.py b/tests/test_score_nuscatter_pn/results.py index 40b65f9da..badc816d9 100644 --- a/tests/test_score_nuscatter_pn/results.py +++ b/tests/test_score_nuscatter_pn/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_nuscatter_yn/results.py b/tests/test_score_nuscatter_yn/results.py index 40b65f9da..badc816d9 100644 --- a/tests/test_score_nuscatter_yn/results.py +++ b/tests/test_score_nuscatter_yn/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_scatter/results.py b/tests/test_score_scatter/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_score_scatter/results.py +++ b/tests/test_score_scatter/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_scatter_n/results.py b/tests/test_score_scatter_n/results.py index 63208a987..ec65cc60e 100644 --- a/tests/test_score_scatter_n/results.py +++ b/tests/test_score_scatter_n/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_scatter_pn/results.py b/tests/test_score_scatter_pn/results.py index 40b65f9da..badc816d9 100644 --- a/tests/test_score_scatter_pn/results.py +++ b/tests/test_score_scatter_pn/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_scatter_yn/results.py b/tests/test_score_scatter_yn/results.py index 40b65f9da..badc816d9 100644 --- a/tests/test_score_scatter_yn/results.py +++ b/tests/test_score_scatter_yn/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_total/results.py b/tests/test_score_total/results.py index 1384d45d1..1f94be37b 100644 --- a/tests/test_score_total/results.py +++ b/tests/test_score_total/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_score_total_yn/results.py b/tests/test_score_total_yn/results.py index 86ccd719d..92ee8133f 100644 --- a/tests/test_score_total_yn/results.py +++ b/tests/test_score_total_yn/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_seed/results.py b/tests/test_seed/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_seed/results.py +++ b/tests/test_seed/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_source_angle_mono/results.py b/tests/test_source_angle_mono/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_source_angle_mono/results.py +++ b/tests/test_source_angle_mono/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_source_energy_maxwell/results.py b/tests/test_source_energy_maxwell/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_source_energy_maxwell/results.py +++ b/tests/test_source_energy_maxwell/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_source_energy_mono/results.py b/tests/test_source_energy_mono/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_source_energy_mono/results.py +++ b/tests/test_source_energy_mono/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_source_file/results.py b/tests/test_source_file/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_source_file/results.py +++ b/tests/test_source_file/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_source_point/results.py b/tests/test_source_point/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_source_point/results.py +++ b/tests/test_source_point/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_sourcepoint_batch/results.py b/tests/test_sourcepoint_batch/results.py index 1e51de783..2cd808705 100644 --- a/tests/test_sourcepoint_batch/results.py +++ b/tests/test_sourcepoint_batch/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_sourcepoint_interval/results.py b/tests/test_sourcepoint_interval/results.py index 1e51de783..2cd808705 100644 --- a/tests/test_sourcepoint_interval/results.py +++ b/tests/test_sourcepoint_interval/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_sourcepoint_latest/results.py b/tests/test_sourcepoint_latest/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_sourcepoint_latest/results.py +++ b/tests/test_sourcepoint_latest/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_sourcepoint_restart/results.py b/tests/test_sourcepoint_restart/results.py index 9a1f0fcd4..cbf927c5c 100644 --- a/tests/test_sourcepoint_restart/results.py +++ b/tests/test_sourcepoint_restart/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_statepoint_batch/results.py b/tests/test_statepoint_batch/results.py index a43950a29..642492d26 100644 --- a/tests/test_statepoint_batch/results.py +++ b/tests/test_statepoint_batch/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_statepoint_interval/results.py b/tests/test_statepoint_interval/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_statepoint_interval/results.py +++ b/tests/test_statepoint_interval/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_statepoint_restart/results.py b/tests/test_statepoint_restart/results.py index 394c8fc4b..3b7d3303d 100644 --- a/tests/test_statepoint_restart/results.py +++ b/tests/test_statepoint_restart/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_statepoint_sourcesep/results.py b/tests/test_statepoint_sourcesep/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_statepoint_sourcesep/results.py +++ b/tests/test_statepoint_sourcesep/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_survival_biasing/results.py b/tests/test_survival_biasing/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_survival_biasing/results.py +++ b/tests/test_survival_biasing/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_tally_assumesep/results.py b/tests/test_tally_assumesep/results.py index c775a8007..f2df0495f 100644 --- a/tests/test_tally_assumesep/results.py +++ b/tests/test_tally_assumesep/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_tally_nuclides/results.py b/tests/test_tally_nuclides/results.py index 4d6d2f05e..1fbdd5e3c 100644 --- a/tests/test_tally_nuclides/results.py +++ b/tests/test_tally_nuclides/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_trace/results.py b/tests/test_trace/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_trace/results.py +++ b/tests/test_trace/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_track_output/results.py b/tests/test_track_output/results.py index f79b47eff..959dd40d5 100644 --- a/tests/test_track_output/results.py +++ b/tests/test_track_output/results.py @@ -17,7 +17,7 @@ except ImportError: exit() # Run track processing script -call(['../../src/utils/track.py', '-o', 'poly'] + +call(['../../track.py', '-o', 'poly'] + glob.glob(''.join((cwd, '/track*')))) poly = ''.join((cwd, '/poly.pvtp')) assert os.path.isfile(poly), 'poly.pvtp file not found.' diff --git a/tests/test_translation/results.py b/tests/test_translation/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_translation/results.py +++ b/tests/test_translation/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_trigger_batch_interval/results.py b/tests/test_trigger_batch_interval/results.py index 922fd4f74..6cdec2654 100644 --- a/tests/test_trigger_batch_interval/results.py +++ b/tests/test_trigger_batch_interval/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') from openmc.statepoint import StatePoint diff --git a/tests/test_trigger_no_batch_interval/results.py b/tests/test_trigger_no_batch_interval/results.py index 3665b48a9..97ac258df 100644 --- a/tests/test_trigger_no_batch_interval/results.py +++ b/tests/test_trigger_no_batch_interval/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') from openmc.statepoint import StatePoint diff --git a/tests/test_trigger_no_status/results.py b/tests/test_trigger_no_status/results.py index 7754ec7e5..36bfc3b3d 100644 --- a/tests/test_trigger_no_status/results.py +++ b/tests/test_trigger_no_status/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') from openmc.statepoint import StatePoint diff --git a/tests/test_trigger_tallies/results.py b/tests/test_trigger_tallies/results.py index 88aa4146f..24602909b 100644 --- a/tests/test_trigger_tallies/results.py +++ b/tests/test_trigger_tallies/results.py @@ -3,7 +3,7 @@ import sys import numpy as np -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') from openmc.statepoint import StatePoint diff --git a/tests/test_uniform_fs/results.py b/tests/test_uniform_fs/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_uniform_fs/results.py +++ b/tests/test_uniform_fs/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_union_energy_grids/results.py b/tests/test_union_energy_grids/results.py index b616e2874..234e69f33 100644 --- a/tests/test_union_energy_grids/results.py +++ b/tests/test_union_energy_grids/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') from openmc.statepoint import StatePoint # read in statepoint file diff --git a/tests/test_universe/results.py b/tests/test_universe/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_universe/results.py +++ b/tests/test_universe/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint diff --git a/tests/test_void/results.py b/tests/test_void/results.py index d7aba2bcf..455905701 100644 --- a/tests/test_void/results.py +++ b/tests/test_void/results.py @@ -2,7 +2,7 @@ import sys -sys.path.insert(0, '../../src/utils') +sys.path.insert(0, '../..') # import statepoint from openmc.statepoint import StatePoint