Skip to content

Commit 4820c80

Browse files
BitterB0NG0BitterB0NG0
committed
outp: fixed 1tally 8 nps blocks
1 parent 19866b4 commit 4820c80

4 files changed

Lines changed: 51 additions & 12 deletions

File tree

‎src/pymcnp/Outp.py‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,26 @@ def from_mcnp(source: str):
6161

6262
if len(tokens) > 2:
6363
header = outp.Header.from_mcnp(tokens[0] + '\n')
64-
tokens[1] = '1' + ''.join(filter(bool, tokens[1:]))
64+
tokens[1] = ''.join(filter(bool, tokens[1:]))
6565
else:
6666
header = outp.Header.from_mcnp(tokens[0])
6767
tokens.append('')
6868

6969
blocks = []
70-
for subsource in outp.Block._REGEX.finditer(tokens[1]):
70+
for subsource in re.split(r'\n1', tokens[1]):
71+
if not subsource:
72+
continue
73+
else:
74+
subsource = '1' + subsource
75+
7176
for subclass in outp.Block.__subclasses__():
7277
try:
73-
if block := subclass.from_mcnp(subsource[0]):
78+
if block := subclass.from_mcnp(subsource):
7479
break
7580
except Exception:
7681
continue
82+
else:
83+
continue
7784

7885
blocks.append(block)
7986

‎src/pymcnp/outp/Tally_8.py‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class Tally_8(_block.Block):
1818
nps: Tally nps.
1919
tally_type: Tally type.
2020
particles: Tally particles.
21+
message: Tally modification message.
2122
subtallies: Subtallies.
2223
stats_desired: Statistical checks desired.
2324
stats_observed: Statistical checks observed.
@@ -29,7 +30,7 @@ class Tally_8(_block.Block):
2930
_REGEX = re.compile(
3031
r'\A1tally (.{8}) nps = (.{11})\n'
3132
r' tally type (.+)\n'
32-
r' particle[(]s[)]: (.+)\n \n'
33+
r' particle[(]s[)]: (.+)(\n.*)?\n \n'
3334
rf'((?:{tally.Subtally_4._REGEX.pattern[2:-2]})+)\n'
3435
r' ===================================================================================================================================\n\n'
3536
r' results of 10 statistical checks for the estimated answer for the tally fluctuation chart [(]tfc[)] bin of tally .{8}\n\n'
@@ -52,6 +53,7 @@ def __init__(
5253
nps: types.String,
5354
tally_type: types.String,
5455
particles: types.String,
56+
message: types.String,
5557
subtallies: types.Tuple(tally.Subtally_1),
5658
stats_desired: types.String,
5759
stats_observed: types.String,
@@ -67,6 +69,7 @@ def __init__(
6769
nps: Tally nps.
6870
tally_type: Tally type.
6971
particles: Tally particles.
72+
message: Tally modification message.
7073
subtallies: Subtallies.
7174
stats_desired: Statistical checks desired.
7275
stats_observed: Statistical checks observed.
@@ -103,6 +106,7 @@ def __init__(
103106
self.nps: typing.Final[types.String] = nps
104107
self.tally_type: typing.Final[types.String] = tally_type
105108
self.particles: typing.Final[types.String] = particles
109+
self.message: typing.Final[types.String] = message
106110
self.subtallies: typing.Final[types.Tuple(tally.Subtally_1)] = subtallies
107111
self.stats_desired: typing.Final[types.String] = stats_desired
108112
self.stats_observed: typing.Final[types.String] = stats_observed
@@ -131,19 +135,21 @@ def from_mcnp(source: str):
131135
nps = types.String.from_mcnp(tokens[2])
132136
tally_type = types.String.from_mcnp(tokens[3])
133137
particles = types.String.from_mcnp(tokens[4])
134-
subtallies = types.Tuple(tally.Subtally_4).from_mcnp(tokens[5])
138+
message = types.String.from_mcnp(tokens[5]) if tokens[5] else None
139+
subtallies = types.Tuple(tally.Subtally_4).from_mcnp(tokens[6])
135140
offset = tally.Subtally_2._REGEX.groups
136-
stats_desired = types.String.from_mcnp(tokens[6 + offset])
137-
stats_observed = types.String.from_mcnp(tokens[7 + offset])
138-
stats_passed = types.String.from_mcnp(tokens[8 + offset])
139-
asymmetric_interval = types.String.from_mcnp(tokens[9 + offset])
140-
symmetric_interval = types.String.from_mcnp(tokens[10 + offset])
141+
stats_desired = types.String.from_mcnp(tokens[7 + offset])
142+
stats_observed = types.String.from_mcnp(tokens[8 + offset])
143+
stats_passed = types.String.from_mcnp(tokens[9 + offset])
144+
asymmetric_interval = types.String.from_mcnp(tokens[10 + offset])
145+
symmetric_interval = types.String.from_mcnp(tokens[11 + offset])
141146

142147
return Tally_8(
143148
number,
144149
nps,
145150
tally_type,
146151
particles,
152+
message,
147153
subtallies,
148154
stats_desired,
149155
stats_observed,
@@ -163,7 +169,7 @@ def to_mcnp(self):
163169
return f"""
164170
1tally {self.number} nps = {self.nps}
165171
tally type {self.tally_type}
166-
particle(s): {self.particles}
172+
particle(s): {self.particles}{'\n ' + str(self.message) + '\n' if self.message else ''}
167173
168174
{''.join(map(str, self.subtallies))}
169175
===================================================================================================================================

‎tests/classes.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Test_Init:
1212

1313
def test_valid(self):
1414
"""
15-
Tests `EXAMPLES_VALID` on `from_mcnp` and `to_mcnp`.
15+
Tests `EXAMPLES_VALID` on `__init__`.
1616
"""
1717

1818
for example in self.EXAMPLES_VALID:
@@ -39,7 +39,9 @@ def test_valid(self):
3939
"""
4040

4141
for example in self.EXAMPLES_VALID:
42+
print(repr(example))
4243
a = self.element.from_mcnp(example)
44+
print(repr(str(a)))
4345
b = self.element.from_mcnp(a.to_mcnp())
4446

4547
assert a == b

‎tests/test_pymcnp/test_outp/test_Tally_8.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,20 @@ class Test_Init(classes.Test_Init):
1212
'nps': consts.string.types.STRING,
1313
'tally_type': consts.string.types.STRING,
1414
'particles': consts.string.types.STRING,
15+
'message': consts.string.types.STRING,
16+
'subtallies': consts.string.types.STRING,
17+
'stats_desired': consts.string.types.STRING,
18+
'stats_observed': consts.string.types.STRING,
19+
'stats_passed': consts.string.types.STRING,
20+
'asymmetric_interval': consts.string.types.STRING,
21+
'symmetric_interval': consts.string.types.STRING,
22+
},
23+
{
24+
'number': consts.string.types.STRING,
25+
'nps': consts.string.types.STRING,
26+
'tally_type': consts.string.types.STRING,
27+
'particles': consts.string.types.STRING,
28+
'message': None,
1529
'subtallies': consts.string.types.STRING,
1630
'stats_desired': consts.string.types.STRING,
1731
'stats_observed': consts.string.types.STRING,
@@ -26,6 +40,7 @@ class Test_Init(classes.Test_Init):
2640
'nps': consts.string.types.STRING,
2741
'tally_type': consts.string.types.STRING,
2842
'particles': consts.string.types.STRING,
43+
'message': consts.string.types.STRING,
2944
'subtallies': consts.string.types.STRING,
3045
'stats_desired': consts.string.types.STRING,
3146
'stats_observed': consts.string.types.STRING,
@@ -38,6 +53,7 @@ class Test_Init(classes.Test_Init):
3853
'nps': None,
3954
'tally_type': consts.string.types.STRING,
4055
'particles': consts.string.types.STRING,
56+
'message': consts.string.types.STRING,
4157
'subtallies': consts.string.types.STRING,
4258
'stats_desired': consts.string.types.STRING,
4359
'stats_observed': consts.string.types.STRING,
@@ -50,6 +66,7 @@ class Test_Init(classes.Test_Init):
5066
'nps': consts.string.types.STRING,
5167
'tally_type': None,
5268
'particles': consts.string.types.STRING,
69+
'message': consts.string.types.STRING,
5370
'subtallies': consts.string.types.STRING,
5471
'stats_desired': consts.string.types.STRING,
5572
'stats_observed': consts.string.types.STRING,
@@ -62,6 +79,7 @@ class Test_Init(classes.Test_Init):
6279
'nps': consts.string.types.STRING,
6380
'tally_type': consts.string.types.STRING,
6481
'particles': None,
82+
'message': consts.string.types.STRING,
6583
'subtallies': consts.string.types.STRING,
6684
'stats_desired': consts.string.types.STRING,
6785
'stats_observed': consts.string.types.STRING,
@@ -74,6 +92,7 @@ class Test_Init(classes.Test_Init):
7492
'nps': consts.string.types.STRING,
7593
'tally_type': consts.string.types.STRING,
7694
'particles': consts.string.types.STRING,
95+
'message': consts.string.types.STRING,
7796
'subtallies': None,
7897
'stats_desired': consts.string.types.STRING,
7998
'stats_observed': consts.string.types.STRING,
@@ -86,6 +105,7 @@ class Test_Init(classes.Test_Init):
86105
'nps': consts.string.types.STRING,
87106
'tally_type': consts.string.types.STRING,
88107
'particles': consts.string.types.STRING,
108+
'message': consts.string.types.STRING,
89109
'subtallies': consts.string.types.STRING,
90110
'stats_desired': None,
91111
'stats_observed': consts.string.types.STRING,
@@ -98,6 +118,7 @@ class Test_Init(classes.Test_Init):
98118
'nps': consts.string.types.STRING,
99119
'tally_type': consts.string.types.STRING,
100120
'particles': consts.string.types.STRING,
121+
'message': consts.string.types.STRING,
101122
'subtallies': consts.string.types.STRING,
102123
'stats_desired': consts.string.types.STRING,
103124
'stats_observed': None,
@@ -110,6 +131,7 @@ class Test_Init(classes.Test_Init):
110131
'nps': consts.string.types.STRING,
111132
'tally_type': consts.string.types.STRING,
112133
'particles': consts.string.types.STRING,
134+
'message': consts.string.types.STRING,
113135
'subtallies': consts.string.types.STRING,
114136
'stats_desired': consts.string.types.STRING,
115137
'stats_observed': consts.string.types.STRING,
@@ -122,6 +144,7 @@ class Test_Init(classes.Test_Init):
122144
'nps': consts.string.types.STRING,
123145
'tally_type': consts.string.types.STRING,
124146
'particles': consts.string.types.STRING,
147+
'message': consts.string.types.STRING,
125148
'subtallies': consts.string.types.STRING,
126149
'stats_desired': consts.string.types.STRING,
127150
'stats_observed': consts.string.types.STRING,
@@ -134,6 +157,7 @@ class Test_Init(classes.Test_Init):
134157
'nps': consts.string.types.STRING,
135158
'tally_type': consts.string.types.STRING,
136159
'particles': consts.string.types.STRING,
160+
'message': consts.string.types.STRING,
137161
'subtallies': consts.string.types.STRING,
138162
'stats_desired': consts.string.types.STRING,
139163
'stats_observed': consts.string.types.STRING,

0 commit comments

Comments
 (0)