Skip to content

Commit

Permalink
merge from travleev's master
Browse files Browse the repository at this point in the history
  • Loading branch information
dvp2015 committed Oct 8, 2019
2 parents d73cb8d + 2509f5c commit 5a01927
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion numjuggler/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
# Y -- minor version. New minor version, when new function(s) added.
#
# Z -- update, new update number when a bug is fixed.
__version__ = '2.42a.27'
__version__ = '2.42a.29'
2 changes: 1 addition & 1 deletion numjuggler/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ def cfunc(n):
c.get_values()
if c.dtype == 'Mn':
inp = []
inp.append(c.input[0].replace('} ',
inp.append(c.input[0].replace('}',
'} 1001 1.0 $ msimpl ', 1))
for i in c.input[1:]:
inp.append('c msimpl ' + i)
Expand Down
2 changes: 1 addition & 1 deletion numjuggler/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ def _split_data(input_):
elif (t[0][0].lower() == 'm' and
'mode' not in t[0].lower() and
'mesh' not in t[0].lower()):
# Mn, MTn or MPNn card
# This is the Mn, MTn or MPNn card
ms = _get_int(t[0])
inpt = inpt.replace(ms, tp, 1)
vals.append((int(ms), 'mat'))
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def load_version():
version=load_version(),
description='MCNP input file renumbering tool',
author='A.Travleev',
author_email='anton.travleev@kit.edu',
author_email='anton.travleev@gmail.com',
packages=packages,
tests_require=['pytest', 'pytest-cov>=2.3.1'],
cmdclass={'test': PyTest},
Expand Down

0 comments on commit 5a01927

Please sign in to comment.