crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 13:45:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Combine multiple intersections/unions when parsing region expressions

Browse source
This commit is contained in:
Paul Romano 2015-09-28 14:48:29 +07:00
parent 98d745d9ce
commit 975771fbfe
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openmc/region.py
View file

@ -95,6 +95,9 @@ class Region(object):
elif isinstance(r2, Intersection) and hasattr(r1, 'surface'):
r2.nodes.insert(0, r1)
output.append(r2)
elif isinstance(r1, Intersection) and isinstance(r2, Intersection):
r1.nodes += r2.nodes
output.append(r1)
else:
output.append(Intersection(r1, r2))
elif operator == '^':
@ -105,6 +108,9 @@ class Region(object):
elif isinstance(r2, Union) and hasattr(r1, 'surface'):
r2.nodes.insert(0, r1)
output.append(r2)
elif isinstance(r1, Union) and isinstance(r2, Union):
r1.nodes += r2.nodes
output.append(r1)
else:
output.append(Union(r1, r2))
elif operator == '~':