From 6e29cf2fbe65dbfe8aec3e6554b0619ae9c87b82 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Wed, 29 Apr 2015 06:42:56 +0700
Subject: [PATCH] Remove installation of two scripts from CMakeLists.txt. Move
 particle_restart.py to utils/openmc folder to make it part of Python API.

---
 src/CMakeLists.txt                            | 7 ++-----
 src/utils/{ => openmc}/particle_restart.py    | 0
 tests/test_particle_restart_eigval/results.py | 2 +-
 tests/test_particle_restart_fixed/results.py  | 8 ++++----
 4 files changed, 7 insertions(+), 10 deletions(-)
 rename src/utils/{ => openmc}/particle_restart.py (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d3785aa6a3..5fb11848db 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -261,15 +261,12 @@ set_target_properties(${program} PROPERTIES
 #===============================================================================
 
 install(TARGETS ${program} RUNTIME DESTINATION bin)
-install(PROGRAMS utils/statepoint_cmp.py
+install(PROGRAMS utils/plot_mesh_tally.py
   DESTINATION bin
-  RENAME statepoint_cmp)
+  RENAME plot_mesh_tally)
 install(PROGRAMS utils/statepoint_histogram.py
   DESTINATION bin
   RENAME statepoint_histogram)
-install(PROGRAMS utils/statepoint_meshplot.py
-  DESTINATION bin
-  RENAME statepoint_meshplot)
 install(PROGRAMS utils/update_inputs.py
   DESTINATION bin
   RENAME update_inputs)
diff --git a/src/utils/particle_restart.py b/src/utils/openmc/particle_restart.py
similarity index 100%
rename from src/utils/particle_restart.py
rename to src/utils/openmc/particle_restart.py
diff --git a/tests/test_particle_restart_eigval/results.py b/tests/test_particle_restart_eigval/results.py
index ae446b855d..2ff1ef2b89 100644
--- a/tests/test_particle_restart_eigval/results.py
+++ b/tests/test_particle_restart_eigval/results.py
@@ -5,7 +5,7 @@ import sys
 sys.path.insert(0, '../../src/utils')
 
 # import particle restart
-import particle_restart as pr
+import openmc.particle_restart as pr
 
 # read in particle restart file
 if len(sys.argv) > 1:
diff --git a/tests/test_particle_restart_fixed/results.py b/tests/test_particle_restart_fixed/results.py
index a5bac1da9b..6c9a40d5a8 100644
--- a/tests/test_particle_restart_fixed/results.py
+++ b/tests/test_particle_restart_fixed/results.py
@@ -4,8 +4,8 @@ import sys
 
 sys.path.insert(0, '../../src/utils')
 
-# import particle restart 
-import particle_restart as pr
+# import particle restart
+import openmc.particle_restart as pr
 
 # read in particle restart file
 if len(sys.argv) > 1:
@@ -15,8 +15,8 @@ else:
 
 # set up output string
 outstr = ''
- 
-# write out properties 
+
+# write out properties
 outstr += 'current batch:\n'
 outstr += "{0:12.6E}\n".format(p.current_batch)
 outstr += 'current gen:\n'