crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 06:05:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Some whitespace and bracketing changes suggested in code review

Browse source 
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
This commit is contained in:
helen-brooks 2021-06-18 09:01:38 +01:00 • committed by GitHub
parent c487c9ad2d
commit 9dbbf82d25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/mesh.cpp
View file

@ -1639,7 +1639,6 @@ MOABMesh::create_interface()
if (rval != moab::MB_SUCCESS) {
fatal_error("Failed to load the unstructured mesh file: " + filename_);
}
}
}

16
tests/regression_tests/external_moab/test.py
View file

@ -64,8 +64,8 @@ def cpp_driver(request):
shutil.rmtree('build')
os.remove('CMakeLists.txt')
class ExternalMoabTest(PyAPITestHarness):
class ExternalMoabTest(PyAPITestHarness):
def __init__(self, executable, statepoint_name, model):
super().__init__(statepoint_name, model)
self.executable = executable
@ -80,7 +80,6 @@ class ExternalMoabTest(PyAPITestHarness):
openmc.run(openmc_exec=self.executable,
event_based=config['event'])
# Override some methods to do nothing
def _get_results(self):
pass
@ -100,8 +99,8 @@ class ExternalMoabTest(PyAPITestHarness):
with openmc.StatePoint(self._sp_name) as sp:
# loop over the tallies and get data
ext_data=[]
unstr_data=[]
ext_data = []
unstr_data = []
for tally in sp.tallies.values():
@ -111,17 +110,17 @@ class ExternalMoabTest(PyAPITestHarness):
if isinstance(flt.mesh, openmc.UnstructuredMesh):
if(tally.name == "external mesh tally"):
if tally.name == "external mesh tally":
ext_data = tally.get_reshaped_data(value='mean')
elif (tally.name == "unstructured mesh tally"):
elif tally.name == "unstructured mesh tally":
unstr_data = tally.get_reshaped_data(value='mean')
# we expect these results to be the same to within at 8
# decimal places
decimals = 8
np.testing.assert_array_almost_equal(unstr_data,
ext_data,decimals)
ext_data, decimals)
@staticmethod
def get_mesh_tally_data(tally):
@ -131,7 +130,6 @@ class ExternalMoabTest(PyAPITestHarness):
std_dev.shape = (std_dev.size, 1)
return np.sum(data, axis=1), np.sum(std_dev, axis=1)
def _cleanup(self):
super()._cleanup()
output = glob.glob('tally*.vtk')
@ -238,7 +236,7 @@ def test_external_mesh(cpp_driver):
mesh_filename = "test_mesh_tets.h5m"
# Create a normal unstructured mesh to compare to
uscd_mesh = openmc.UnstructuredMesh(mesh_filename,'moab')
uscd_mesh = openmc.UnstructuredMesh(mesh_filename, 'moab')
# Create filters
uscd_filter = openmc.MeshFilter(mesh=uscd_mesh)