diff --git a/tests/unit_tests/test_mesh.py b/tests/unit_tests/test_mesh.py index c6ebd687f7e..861937e0c12 100644 --- a/tests/unit_tests/test_mesh.py +++ b/tests/unit_tests/test_mesh.py @@ -14,6 +14,8 @@ from uncertainties.unumpy import uarray, nominal_values, std_devs +UMESH_DIR = Path(__file__).resolve().parents[1] / 'regression_tests' / 'unstructured_mesh' + @pytest.mark.parametrize("val_left,val_right", [(0, 0), (-1., -1.), (2.0, 2)]) def test_raises_error_when_flat(val_left, val_right): """Checks that an error is raised when a mesh is flat""" @@ -388,7 +390,7 @@ def test_mesh_name_roundtrip(run_in_tmpdir): def test_umesh_roundtrip(run_in_tmpdir, request): - umesh = openmc.UnstructuredMesh(request.path.parent / 'test_mesh_tets.e', 'moab') + umesh = openmc.UnstructuredMesh(UMESH_DIR / 'test_mesh_tets.exo', 'moab') umesh.interface = 'xdg' umesh.output = True @@ -562,11 +564,11 @@ def test_umesh(run_in_tmpdir, simple_umesh, export_type): vtkhdf_tests = [ ( - Path("test_mesh_dagmc_tets.vtk"), + UMESH_DIR / "test_mesh_dagmc_tets.vtk", "moab" ), ( - Path("test_mesh_hexes.exo"), + UMESH_DIR / "test_mesh_hexes.exo", "libmesh" ) ] diff --git a/tests/unit_tests/test_mesh_dagmc_tets.vtk b/tests/unit_tests/test_mesh_dagmc_tets.vtk deleted file mode 120000 index 9f7000175d7..00000000000 --- a/tests/unit_tests/test_mesh_dagmc_tets.vtk +++ /dev/null @@ -1 +0,0 @@ -../regression_tests/unstructured_mesh/test_mesh_dagmc_tets.vtk \ No newline at end of file diff --git a/tests/unit_tests/test_mesh_hexes.exo b/tests/unit_tests/test_mesh_hexes.exo deleted file mode 120000 index 272da92a4ad..00000000000 --- a/tests/unit_tests/test_mesh_hexes.exo +++ /dev/null @@ -1 +0,0 @@ -../regression_tests/unstructured_mesh/test_mesh_hexes.exo \ No newline at end of file diff --git a/tests/unit_tests/test_mesh_tets.e b/tests/unit_tests/test_mesh_tets.e deleted file mode 120000 index 8a6287b4de2..00000000000 --- a/tests/unit_tests/test_mesh_tets.e +++ /dev/null @@ -1 +0,0 @@ -../regression_tests/unstructured_mesh/test_mesh_tets.e \ No newline at end of file diff --git a/tests/unit_tests/test_source_mesh.py b/tests/unit_tests/test_source_mesh.py index 78211493a55..398e74325f4 100644 --- a/tests/unit_tests/test_source_mesh.py +++ b/tests/unit_tests/test_source_mesh.py @@ -15,6 +15,8 @@ # MeshSpatial Tests ################### TETS_PER_VOXEL = 12 +UMESH_TETS = (Path(__file__).resolve().parents[1] / 'regression_tests' / + 'unstructured_mesh' / 'test_mesh_tets.exo') # This test uses a geometry file with cells that match a regular mesh. Each cell # in the geometry corresponds to 12 tetrahedra in the unstructured mesh file. @@ -83,7 +85,7 @@ def test_unstructured_mesh_sampling(model, request, test_cases): pytest.skip("XDG mesh interface not enabled in this build.") # setup mesh source ### - mesh_filename = Path(request.fspath).parent / "test_mesh_tets.e" + mesh_filename = UMESH_TETS uscd_mesh = openmc.UnstructuredMesh(mesh_filename, test_cases['library']) uscd_mesh.interface = test_cases['interface'] @@ -153,7 +155,7 @@ def test_unstructured_mesh_sampling(model, request, test_cases): def test_strengths_size_failure(request, model): # setup mesh source ### - mesh_filename = Path(request.fspath).parent / "test_mesh_tets.e" + mesh_filename = UMESH_TETS uscd_mesh = openmc.UnstructuredMesh(mesh_filename, 'libmesh') # intentionally incorrectly sized to trigger an error @@ -191,7 +193,7 @@ def test_roundtrip(run_in_tmpdir, model, request): ): pytest.skip("Unstructured mesh is not enabled in this build.") - mesh_filename = Path(request.fspath).parent / 'test_mesh_tets.e' + mesh_filename = UMESH_TETS ucd_mesh = openmc.UnstructuredMesh(mesh_filename, library='libmesh') if not openmc.lib.feature_enabled('libmesh'): @@ -339,7 +341,7 @@ def test_umesh_source_independent(run_in_tmpdir, request, void_model, library, i model = void_model - mesh_filename = Path(request.fspath).parent / "test_mesh_tets.e" + mesh_filename = UMESH_TETS uscd_mesh = openmc.UnstructuredMesh(mesh_filename, library) uscd_mesh.interface = interface ind_source = openmc.IndependentSource() diff --git a/tests/unit_tests/weightwindows/test.py b/tests/unit_tests/weightwindows/test.py index fa8ca095fd3..3b1d45f9d89 100644 --- a/tests/unit_tests/weightwindows/test.py +++ b/tests/unit_tests/weightwindows/test.py @@ -14,6 +14,9 @@ from tests import cdtemp +UMESH_TETS = (Path(__file__).resolve().parents[2] / 'regression_tests' / + 'unstructured_mesh' / 'test_mesh_tets.exo') + @pytest.fixture def wws(): @@ -372,7 +375,7 @@ def test_unstructured_mesh_applied_wws(request, run_in_tmpdir, library, interfac cell = openmc.Cell(region=-box, fill=water) geometry = openmc.Geometry([cell]) - mesh_file = str(request.fspath.dirpath() / 'test_mesh_tets.exo') + mesh_file = str(UMESH_TETS) mesh = openmc.UnstructuredMesh(mesh_file, library) mesh.interface = interface diff --git a/tests/unit_tests/weightwindows/test_mesh_tets.exo b/tests/unit_tests/weightwindows/test_mesh_tets.exo deleted file mode 120000 index 5bf23b369a3..00000000000 --- a/tests/unit_tests/weightwindows/test_mesh_tets.exo +++ /dev/null @@ -1 +0,0 @@ -../../regression_tests/unstructured_mesh/test_mesh_tets.e \ No newline at end of file diff --git a/tests/unit_tests/weightwindows/test_ww_list.py b/tests/unit_tests/weightwindows/test_ww_list.py index c6c82ebd17d..4198535fd13 100644 --- a/tests/unit_tests/weightwindows/test_ww_list.py +++ b/tests/unit_tests/weightwindows/test_ww_list.py @@ -1,3 +1,5 @@ +from pathlib import Path + import h5py import numpy as np import pytest @@ -6,6 +8,9 @@ import openmc.lib +UMESH_TETS = (Path(__file__).resolve().parents[2] / 'regression_tests' / + 'unstructured_mesh' / 'test_mesh_tets.exo') + def test_ww_roundtrip(request, run_in_tmpdir, monkeypatch): # Load weight windows from a wwinp file wwinp_file = request.path.with_name('wwinp_n') @@ -87,7 +92,7 @@ def test_export_hdf5_unstructured_mesh(request, run_in_tmpdir, library): pytest.skip('DAGMC (and MOAB) not enabled in this build.') mesh = openmc.UnstructuredMesh( - request.path.with_name('test_mesh_tets.exo'), library, mesh_id=20, + UMESH_TETS, library, mesh_id=20, name='unstructured', length_multiplier=2.0) ww = openmc.WeightWindows(mesh, np.ones(12_000), upper_bound_ratio=5.0) openmc.WeightWindowsList([ww]).export_to_hdf5('ww.h5')