Fix openmc imports in tests and fix a few paths in run_test.py

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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.'

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

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
 

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
 

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
 

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
 

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

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

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

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