Skip to content

Streamline use of CompositeSurface with SurfaceFilter #3167

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 12 commits into from
Feb 21, 2025
Merged

Streamline use of CompositeSurface with SurfaceFilter #3167

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f07974e
CompositeSurface get_surface() and get_id_surface() added
zoeprieto Oct 11, 2024
e4c0ee8
Update openmc/model/surface_composite.py
zoeprieto Oct 15, 2024
c418c32
Update openmc/model/surface_composite.py
zoeprieto Oct 15, 2024
9f03bcc
SurfaceFilter accept CompositeSurface
zoeprieto Oct 15, 2024
f0cee3a
SurfaceFilter fix
zoeprieto Oct 15, 2024
a7fa568
CompositeSource + Surfaces and warning added
zoeprieto Oct 16, 2024
7c8df81
fix when there is only CompositeSurface
zoeprieto Oct 16, 2024
906763d
Refactor addition of component surfaces to SurfaceFilter
pshriwise Oct 17, 2024
7d2e116
Refactor bin checking/cleaning for WithIDFilter
pshriwise Oct 17, 2024
066f2a4
Updating surface filter test w/ composite surfaces
pshriwise Oct 17, 2024
f37d7d9
Handle single objects up front in SurfaceFilter.clean_bins
pshriwise Oct 17, 2024
2968a5e
Revert most changes and leave component_surfaces properties
paulromano Feb 19, 2025
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
CompositeSurface get_surface() and get_id_surface() added
  • Loading branch information
@zoeprieto
zoeprieto committed Oct 11, 2024
commit f07974e138b7fdcc12e1407f64406bf31cbedb6f
6 changes: 6 additions & 0 deletions openmc/model/surface_composite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ def rotate(self, rotation, pivot=(0., 0., 0.), order='xyz', inplace=False):
s = getattr(surf, name)
setattr(surf, name, s.rotate(rotation, pivot, order, inplace))
return surf

def get_surfaces(self):
Comment thread
zoeprieto marked this conversation as resolved.
Resolved
return [getattr(self, name) for name in self._surface_names]

def get_id_surfaces(self):
return [getattr(self, name).id for name in self._surface_names]
Comment thread
zoeprieto marked this conversation as resolved.
Resolved

@property
def boundary_type(self):
Expand Down
40 changes: 40 additions & 0 deletions tests/unit_tests/test_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,3 +294,43 @@ def test_tabular_from_energyfilter():

tab = efilter.get_tabular(values=np.array([10, 10, 5]), interpolation='linear-linear')
assert tab.interpolation == 'linear-linear'


def test_SurfaceFilter_CompositeSurface(run_in_tmpdir, box_model):
m = openmc.Material()
m.add_nuclide('U235', 1.0)
m.set_density('g/cm3', 1.0)

box = openmc.model.RectangularPrism(10., 10., boundary_type='vacuum')
c = openmc.Cell(fill=m, region=-box)
box_model.geometry.root_universe = openmc.Universe(cells=[c])

tally = openmc.Tally()
tally.filters = [openmc.SurfaceFilter(box.get_surfaces())]

@pshriwise pshriwise Oct 15, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think better yet we'd be able to pass a CompositeSurface directly to the SurfaceFilter class, which might require some additional handling in that object.

@zoeprieto zoeprieto Oct 16, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think it is clearer. It is already done. I thought it was easier to change the SurfaceFilter class than to make a CompositeSurface always return a list of surfaces. Let me know what you think.

tally.scores = ['current']

box_model.tallies = [tally]

sp_name = box_model.run()

with openmc.StatePoint(sp_name) as sp:
current = sp.tallies[tally.id]
assert len(current.get_pandas_dataframe()['surface']) == 4
assert np.all(current.get_pandas_dataframe()['surface'] == box.get_id_surfaces())

box = openmc.model.RectangularParallelepiped(*[-10, 10]*3, boundary_type='vacuum')
c = openmc.Cell(fill=m, region=-box)
box_model.geometry.root_universe = openmc.Universe(cells=[c])

tally = openmc.Tally()
tally.filters = [openmc.SurfaceFilter(box.get_surfaces())]
tally.scores = ['current']

box_model.tallies = [tally]

sp_name = box_model.run()

with openmc.StatePoint(sp_name) as sp:
current = sp.tallies[tally.id]
assert len(current.get_pandas_dataframe()['surface']) == 6
assert np.all(current.get_pandas_dataframe()['surface'] == box.get_id_surfaces())