Skip to content

Fix for finding redundant surfaces #2263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulromano merged 9 commits into from
Nov 10, 2022
Merged

Fix for finding redundant surfaces #2263

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a67b330
round and change default to True
eepeterson Oct 13, 2022
1ab2cbe
revert to False because of failing tests
eepeterson Oct 13, 2022
4604c10
added attributes and warnings
eepeterson Oct 16, 2022
fec53aa
updated tests
eepeterson Oct 18, 2022
33021f7
removed precision parameter
eepeterson Oct 24, 2022
a46cafa
addressed @pshriwise comments
eepeterson Oct 26, 2022
e8d3e14
cache redundant_surfaces
eepeterson Oct 26, 2022
f5f42a4
Update openmc/geometry.py
eepeterson Oct 26, 2022
1110038
remove get_redundant_surfaces and cache
eepeterson Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
round and change default to True
  • Loading branch information
@eepeterson
eepeterson committed Oct 26, 2022
commit a67b330d8f1ae8bcef1e5534459dc116f2bda21d
5 changes: 3 additions & 2 deletions openmc/geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def add_volume_information(self, volume_calc):
if universe.id in volume_calc.volumes:
universe.add_volume_information(volume_calc)

def export_to_xml(self, path='geometry.xml', remove_surfs=False):
def export_to_xml(self, path='geometry.xml', remove_surfs=True):
"""Export geometry to an XML file.

Parameters
Expand Down Expand Up @@ -411,7 +411,8 @@ def get_redundant_surfaces(self):
"""
tally = defaultdict(list)
for surf in self.get_all_surfaces().values():
coeffs = tuple(surf._coefficients[k] for k in surf._coeff_keys)
coeffs = tuple(round(surf._coefficients[k], 10)
for k in surf._coeff_keys)
key = (surf._type,) + coeffs
tally[key].append(surf)
return {replace.id: keep
Expand Down
2 changes: 1 addition & 1 deletion openmc/model/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ def deplete(self, timesteps, method='cecm', final_step=True,
depletion_operator.cleanup_when_done = True
depletion_operator.finalize()

def export_to_xml(self, directory='.', remove_surfs=False):
def export_to_xml(self, directory='.', remove_surfs=True):
"""Export model to XML files.

Parameters
Expand Down