Skip to content
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.

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

Fix #2994, non-existent path causes segmentation fault when saving plot #3038

Merged
merged 3 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions src/plot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,11 @@ void Plot::set_output_path(pugi::xml_node plot_node)
} else {
filename = fmt::format("plot_{}", id());
}
const std::string dir_if_present =
filename.substr(0, filename.find_last_of("/") + 1);
if (dir_if_present.size() > 0 && !dir_exists(dir_if_present)) {
fatal_error(fmt::format("Directory '{}' does not exist!", dir_if_present));
}
// add appropriate file extension to name
switch (type_) {
case PlotType::slice:
Expand Down
25 changes: 24 additions & 1 deletion tests/unit_tests/test_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def myplot():
plot.width = (100., 100.)
plot.origin = (2., 3., -10.)
plot.pixels = (500, 500)
plot.filename = 'myplot'
plot.filename = './not-a-dir/myplot'
plot.type = 'slice'
plot.basis = 'yz'
plot.background = 'black'
Expand Down Expand Up @@ -221,3 +221,26 @@ def test_voxel_plot_roundtrip():
assert new_plot.origin == plot.origin
assert new_plot.width == plot.width
assert new_plot.color_by == plot.color_by


def test_plot_directory(run_in_tmpdir):
pwr_pin = openmc.examples.pwr_pin_cell()

# create a standard plot, expected to work
plot = openmc.Plot()
plot.filename = 'plot_1'
plot.type = 'slice'
plot.pixels = (10, 10)
plot.color_by = 'material'
plot.width = (100., 100.)
pwr_pin.plots = [plot]
pwr_pin.plot_geometry()

# use current directory, also expected to work
plot.filename = './plot_1'
pwr_pin.plot_geometry()

# use a non-existent directory, should raise an error
plot.filename = './not-a-dir/plot_1'
with pytest.raises(RuntimeError, match='does not exist'):
pwr_pin.plot_geometry()