Merge remote-tracking branch 'upstream/develop' into labels

This commit is contained in:
Will Boyd 2015-04-30 13:23:31 -04:00
commit 04701a311a
10 changed files with 85 additions and 308 deletions

View file

@ -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:

View file

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