Merge branch 'develop' into iso-lab

.gitignore

@@ -8,8 +8,9 @@
 # Compiler python objects
 *.pyc
 
-# OpenMC executable
-src/openmc
+# Python distribution
+dist/
+openmc.egg-info/
 
 # Inputs generated from Python API
 examples/python/**/*.xml
@@ -25,7 +26,7 @@ docs/build
 docs/source/_images/*.pdf
 
 # Source build
-src/build
+build
 
 # build from src/utils/setup.py
 src/utils/build
@@ -33,9 +34,6 @@ src/utils/build
 # xml-fortran reader
 src/xml-fortran/xmlreader
 
-# Modules built from XML templates
-src/templates/*.f90
-
 # Test results error file
 results_error.dat
 
@@ -61,4 +59,4 @@ data/nndc
 
 # PyCharm project configuration files
 .idea
-.idea/*
+.idea/*

CMakeLists.txt

@@ -169,29 +169,29 @@ endif()
 
 # Only initialize git submodules if it is not there. User is responsible
 # for future updates of fox xml submodule.
-if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/xml/fox/.git)
-  if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
+if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/xml/fox/.git)
+  if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
     message("-- Cloning FoX XML git repository...")
     execute_process(COMMAND git clone https://github.com/mit-crpg/fox.git src/xml/fox
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..)
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
     execute_process(COMMAND git checkout bdc852f4f43d969fb1b179cba79295c1e095a455
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/xml/fox)
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/xml/fox)
   else()
     message("-- Initializing/Updating FoX XML submodule...")
     execute_process(COMMAND git submodule init
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..)
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
     execute_process(COMMAND git submodule update
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..)
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
   endif()
 endif()
-add_subdirectory(xml/fox)
+add_subdirectory(src/xml/fox)
 
 #===============================================================================
 # Build OpenMC executable
 #===============================================================================
 
 set(program "openmc")
-file(GLOB source *.F90 xml/openmc_fox.F90)
+file(GLOB source src/*.F90 src/xml/openmc_fox.F90)
 add_executable(${program} ${source})
 target_link_libraries(${program} ${libraries} fox_dom)
 set_target_properties(${program} PROPERTIES
@@ -203,28 +203,16 @@ set_target_properties(${program} PROPERTIES
 #===============================================================================
 
 install(TARGETS ${program} RUNTIME DESTINATION bin)
-install(PROGRAMS utils/plot_mesh_tally.py
-  DESTINATION bin
-  RENAME plot_mesh_tally)
-install(PROGRAMS utils/statepoint_histogram.py
-  DESTINATION bin
-  RENAME statepoint_histogram)
-install(PROGRAMS utils/update_inputs.py
-  DESTINATION bin
-  RENAME update_inputs)
-install(PROGRAMS utils/xml_validate.py
-  DESTINATION bin
-  RENAME xml_validate)
-install(DIRECTORY relaxng DESTINATION share)
-install(FILES ../man/man1/openmc.1 DESTINATION share/man/man1)
-install(FILES ../LICENSE DESTINATION "share/doc/${program}/copyright")
+install(DIRECTORY src/relaxng DESTINATION share/openmc)
+install(FILES man/man1/openmc.1 DESTINATION share/man/man1)
+install(FILES LICENSE DESTINATION "share/doc/${program}/copyright")
 
 find_package(PythonInterp)
 if(PYTHONINTERP_FOUND)
   install(CODE "execute_process(
                   COMMAND ${PYTHON_EXECUTABLE} setup.py install
                   --prefix=${CMAKE_INSTALL_PREFIX}
-                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/utils)")
+                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")
 endif()
 
 #===============================================================================
@@ -235,7 +223,7 @@ endif()
 include(CTest)
 
 # Get a list of all the tests to run
-file(GLOB_RECURSE TESTS ${CMAKE_CURRENT_SOURCE_DIR}/../tests/test_*.py)
+file(GLOB_RECURSE TESTS ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_*.py)
 
 # Check for MEM_CHECK and COVERAGE variables
 if (DEFINED ENV{MEM_CHECK})

data/get_nndc_data.py

@@ -21,8 +21,8 @@ except ImportError:
     from urllib2 import urlopen
 
 cwd = os.getcwd()
-sys.path.append(os.path.join(cwd, '..', 'src', 'utils'))
-from convert_binary import ascii_to_binary
+sys.path.insert(0, os.path.join(cwd, '..'))
+from openmc.ace import ascii_to_binary
 
 baseUrl = 'http://www.nndc.bnl.gov/endf/b7.1/aceFiles/'
 files = ['ENDF-B-VII.1-neutron-293.6K.tar.gz',

docs/source/quickinstall.rst

@@ -43,8 +43,7 @@ the following commands in a terminal:
     git clone https://github.com/mit-crpg/openmc.git
     cd openmc
     git checkout -b master origin/master
-    mkdir src/build
-    cd src/build
+    mkdir build && cd build
     cmake ..
     make
     sudo make install

docs/source/usersguide/input.rst

@@ -55,23 +55,20 @@ files are called:
 Validating XML Files
 --------------------
 
-Input files can be checked before executing OpenMC using the ``xml_validate``
-script. It is located in ``src/utils/xml_validate.py`` in the source code or in
-``bin/xml_validate`` in the install directory.
-
-Two command line arguments can be set when running ``xml_validate``:
+Input files can be checked before executing OpenMC using the
+``openmc-validate-xml`` script which is installed alongside the Python API. Two
+command line arguments can be set when running ``openmc-validate-xml``:
 
 * ``-i``, ``--input-path`` - Location of OpenMC input files.
   *Default*: current working directory
 * ``-r``, ``--relaxng-path`` - Location of OpenMC RelaxNG files.
   *Default*: None
 
-If the RelaxNG path is not set, ``xml_validate`` will search for these files
-because it expects that the user is either running the script located in the
-install directory ``bin`` folder or in ``src/utils``. Once executed, it will
-match OpenMC XML files with their RelaxNG schema and check if they are valid.
-Below is a table of the messages that will be printed after each file is
-checked.
+If the RelaxNG path is not set, the script will search for these files because
+it expects that the user is either running the script located in the install
+directory ``bin`` folder or in ``src/utils``. Once executed, it will match
+OpenMC XML files with their RelaxNG schema and check if they are valid.  Below
+is a table of the messages that will be printed after each file is checked.
 
 ========================  ===================================
 Message                   Description
@@ -193,7 +190,7 @@ should be performed. It has the following attributes/sub-elements:
       *Default*: None
 
     :threshold:
-      The precision trigger's convergence criterion for the 
+      The precision trigger's convergence criterion for the
       combined :math:`k_{eff}`.
 
       *Default*: None
@@ -646,16 +643,16 @@ particle number, respectively.
 -------------------------
 
 OpenMC includes tally precision triggers which allow the user to define
-uncertainty thresholds on :math:`k_{eff}` in the ``<eigenvalue>`` subelement of 
-``settings.xml``, and/or tallies in ``tallies.xml``. When using triggers, 
+uncertainty thresholds on :math:`k_{eff}` in the ``<eigenvalue>`` subelement of
+``settings.xml``, and/or tallies in ``tallies.xml``. When using triggers,
 OpenMC will run until it completes as many batches as defined by ``<batches>``.
-At this point, the uncertainties on all tallied values are computed and 
-compared with their corresponding trigger thresholds. If any triggers have not 
-been met, OpenMC will continue until either all trigger thresholds have been 
+At this point, the uncertainties on all tallied values are computed and
+compared with their corresponding trigger thresholds. If any triggers have not
+been met, OpenMC will continue until either all trigger thresholds have been
 satisfied or ``<max_batches>`` has been reached.
 
 The ``<trigger>`` element provides an active "toggle switch" for tally
-precision trigger(s), the maximum number of batches and the batch interval. It 
+precision trigger(s), the maximum number of batches and the batch interval. It
 has the following attributes/sub-elements:
 
   :active:
@@ -674,11 +671,11 @@ has the following attributes/sub-elements:
     OpenMC will check if the trigger has been reached at each batch defined
     by ``batch_interval`` after the minimum number of batches is reached.
 
-    .. note:: If this tag is not present, the ``batch_interval`` is predicted 
-              dynamically by OpenMC for each convergence check. The predictive 
-              model assumes no correlation between fission sources 
-              distributions from batch-to-batch. This assumption is reasonable 
-              for fixed source and small criticality calculations, but is very 
+    .. note:: If this tag is not present, the ``batch_interval`` is predicted
+              dynamically by OpenMC for each convergence check. The predictive
+              model assumes no correlation between fission sources
+              distributions from batch-to-batch. This assumption is reasonable
+              for fixed source and small criticality calculations, but is very
               optimistic for highly coupled full-core reactor problems.
 
 
@@ -1391,8 +1388,8 @@ The ``<tally>`` element accepts the following sub-elements:
       Number of scoring events
 
   :trigger:
-    Precision trigger applied to all filter bins and nuclides for this tally. 
-    It must specify the trigger's type, threshold and scores to which it will 
+    Precision trigger applied to all filter bins and nuclides for this tally.
+    It must specify the trigger's type, threshold and scores to which it will
     be applied. It has the following attributes/sub-elements:
 
    :type:

docs/source/usersguide/install.rst

@@ -112,7 +112,7 @@ repository::
 By default, the cloned repository will be set to the development branch. To
 switch to the source of the latest stable release, run the following commands::
 
-    cd openmc/src
+    cd openmc
     git checkout master
 
 .. _GitHub: https://github.com/mit-crpg/openmc
@@ -132,14 +132,13 @@ following
 
 .. code-block:: sh
 
-    mkdir src/build
-    cd src/build
+    mkdir build && cd build
     cmake ..
     make
 
 Note that first a build directory is created as a subdirectory of the source
-directory. The Makefile in ``src/`` will automatically perform an out-of-source
-build with default options.
+directory. The Makefile in the top-level directory will automatically perform an
+out-of-source build with default options.
 
 CMakeLists.txt Options
 ++++++++++++++++++++++
@@ -166,7 +165,7 @@ should be used:
 
 .. code-block:: sh
 
-    cmake -Ddebug=on /path/to/src
+    cmake -Ddebug=on /path/to/openmc
 
 Compiling with MPI
 ++++++++++++++++++
@@ -177,14 +176,14 @@ the MPI Fortran wrapper. For example, in a bash shell:
 .. code-block:: sh
 
     export FC=mpif90
-    cmake /path/to/src
+    cmake /path/to/openmc
 
 Note that in many shells, an environment variable can be set for a single
 command, i.e.
 
 .. code-block:: sh
 
-    FC=mpif90 cmake /path/to/src
+    FC=mpif90 cmake /path/to/openmc
 
 Compiling with HDF5
 +++++++++++++++++++
@@ -195,14 +194,14 @@ the HDF5 Fortran wrapper. For example, in a bash shell:
 .. code-block:: sh
 
     export FC=h5fc
-    cmake /path/to/src
+    cmake /path/to/openmc
 
 As noted above, an environment variable can typically be set for a single
 command, i.e.
 
 .. code-block:: sh
 
-    FC=h5fc cmake /path/to/src
+    FC=h5fc cmake /path/to/openmc
 
 To compile with support for both MPI and HDF5, use the parallel HDF5 wrapper
 ``h5pfc`` instead. Note that this requires that your HDF5 installation be
@@ -216,8 +215,7 @@ the root directory of the source code:
 
 .. code-block:: sh
 
-    mkdir src/build
-    cd src/build
+    mkdir build && cd build
     cmake ..
     make
     make install
@@ -267,7 +265,8 @@ the source code root directory:
 
 .. code-block:: sh
 
-    cd src
+    mkdir build && cd build
+    cmake ..
     make
 
 This will build an executable named ``openmc``.
@@ -293,7 +292,6 @@ in the root directory of the OpenMC distribution:
 
 .. code-block:: sh
 
-    cd src
     make
 
 This will build an executable named ``openmc``.
@@ -312,7 +310,6 @@ the source directory and run the following:
 
 .. code-block:: sh
 
-    cd src
     make test
 
 If you want more options for testing you can use ctest_ command. For example,
@@ -320,7 +317,7 @@ if we wanted to run only the plot tests with 4 processors, we run:
 
 .. code-block:: sh
 
-    cd src/build
+    cd build
     ctest -j 4 -R plot
 
 If you want to run the full test suite with different build options please
@@ -365,12 +362,12 @@ the following steps must be taken:
 2. In the root directory, a file named ``xsdir``, or some variant thereof,
    should be present. This file contains a listing of all the cross sections and
    is used by MCNP. This file should be converted to a ``cross_sections.xml``
-   file for use with OpenMC. A Python script is provided in the OpenMC
-   distribution for this purpose:
+   file for use with OpenMC. A utility is provided in the OpenMC distribution
+   for this purpose:
 
    .. code-block:: sh
 
-       openmc/src/utils/convert_xsdir.py xsdir31 cross_sections.xml
+       openmc/scripts/openmc-xsdir-to-xml xsdir31 cross_sections.xml
 
 3. In the converted ``cross_sections.xml`` file, change the contents of the
    <directory> element to the absolute path of the directory containing the
@@ -416,9 +413,8 @@ Running OpenMC
 Once you have a model built (see :ref:`usersguide_input`), you can either run
 the openmc executable directly from the directory containing your XML input
 files, or you can specify as a command-line argument the directory containing
-the XML input files. For example, if the path of your OpenMC executable is
-``/home/username/openmc/src/openmc`` and your XML input files are in the
-directory ``/home/username/somemodel/``, one way to run the simulation would be:
+the XML input files. For example, if your XML input files are in the directory
+``/home/username/somemodel/``, one way to run the simulation would be:
 
 .. code-block:: sh
 

openmc/ace.py

@@ -1,9 +1,5 @@
-#!/usr/bin/env python
-
 from __future__ import division
-
 from struct import pack
-import sys
 
 
 def ascii_to_binary(ascii_file, binary_file):
@@ -67,11 +63,3 @@ def ascii_to_binary(ascii_file, binary_file):
 
     # Close binary file
     binary.close()
-
-if __name__ == '__main__':
-    # Check for proper number of arguments
-    if len(sys.argv) < 3:
-        sys.exit('Usage: {0} ascii_file binary_file'.format(sys.argv[0]))
-
-    # Convert ASCII file
-    ascii_to_binary(sys.argv[1], sys.argv[2])

scripts/openmc-ascii-to-binary

@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from openmc.ace import ascii_to_binary
+import sys
+
+
+if __name__ == '__main__':
+    # Check for proper number of arguments
+    if len(sys.argv) < 3:
+        sys.exit('Usage: {0} ascii_file binary_file'.format(sys.argv[0]))
+
+    # Convert ASCII file
+    ascii_to_binary(sys.argv[1], sys.argv[2])

setup.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+
+import glob
+import os
+try:
+    from setuptools import setup
+    have_setuptools = True
+except ImportError:
+    from distutils.core import setup
+    have_setuptools = False
+
+kwargs = {'name': 'openmc',
+          'version': '0.6.2',
+          'packages': ['openmc'],
+          'scripts': glob.glob('scripts/openmc-*'),
+
+          # Metadata
+          'author': 'Will Boyd',
+          'author_email': 'wbinventor@gmail.com',
+          'description': 'OpenMC Python API',
+          'url': 'https://github.com/mit-crpg/openmc',
+          'classifiers': [
+              'Intended Audience :: Developers',
+              'Intended Audience :: End Users/Desktop',
+              'Intended Audience :: Science/Research',
+              'License :: OSI Approved :: MIT License',
+              'Natural Language :: English',
+              'Programming Language :: Python',
+              'Topic :: Scientific/Engineering'
+          ]}
+
+if have_setuptools:
+    kwargs.update({
+        # Required dependencies
+        'install_requires': ['numpy', 'scipy', 'h5py', 'matplotlib'],
+
+        # Optional dependencies
+        'extras_require': {
+            'pandas': ['pandas'],
+            'vtk': ['vtk', 'silomesh'],
+            'validate': ['lxml']
+        }})
+
+setup(**kwargs)

src/utils/setup.py

@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-from distutils.core import setup
-
-setup(name='openmc',
-      version='0.6.2',
-      description='OpenMC Python API',
-      author='Will Boyd',
-      author_email='wbinventor@gmail.com',
-      url='https://github.com/mit-crpg/openmc',
-      packages=['openmc'])

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,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_cmfd_feed/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 import openmc
 from openmc.statepoint import StatePoint
 

tests/test_cmfd_nofeed/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 import openmc
 from openmc.statepoint import StatePoint
 

tests/test_confidence_intervals/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_density_atombcm/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_density_atomcm3/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_density_kgm3/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_density_sum/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_eigenvalue_genperbatch/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_eigenvalue_no_inactive/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_energy_grid/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_entropy/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_filter_cell/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_filter_cellborn/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_filter_distribcell/results.py

@@ -3,8 +3,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,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_filter_energyout/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_filter_group_transfer/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_filter_material/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_filter_mesh_2d/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_filter_mesh_3d/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_filter_universe/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_fixed_source/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_infinite_cell/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_lattice/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_lattice_hex/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_lattice_mixed/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_lattice_multiple/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_natural_element/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_output/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_particle_restart_eigval/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import particle restart
+sys.path.insert(0, '../..')
 import openmc.particle_restart as pr
 
 # read in particle restart file

tests/test_particle_restart_fixed/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import particle restart
+sys.path.insert(0, '../..')
 import openmc.particle_restart as pr
 
 # read in particle restart file

tests/test_ptables_off/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_reflective_cone/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_reflective_cylinder/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 import openmc.statepoint as statepoint
 
 # read in statepoint file

tests/test_reflective_plane/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 import openmc.statepoint as statepoint
 
 # read in statepoint file

tests/test_reflective_sphere/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 import openmc.statepoint as statepoint
 
 # read in statepoint file

tests/test_resonance_scattering/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_rotation/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 import openmc.statepoint as statepoint
 
 # read in statepoint file

tests/test_salphabeta/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 import openmc.statepoint as statepoint
 
 # read in statepoint file

tests/test_salphabeta_multiple/results.py

@@ -2,9 +2,7 @@
 
 import sys
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_MT/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_absorption/results.py

@@ -4,9 +4,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_current/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_events/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_fission/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_flux/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_flux_yn/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_kappafission/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_nufission/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_nuscatter/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_nuscatter_n/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_nuscatter_pn/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file

tests/test_score_nuscatter_yn/results.py

@@ -3,9 +3,7 @@
 import sys
 import numpy as np
 
-sys.path.insert(0, '../../src/utils')
-
-# import statepoint
+sys.path.insert(0, '../..')
 from openmc.statepoint import StatePoint
 
 # read in statepoint file