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

merged remote into local after review

Browse source
This commit is contained in:
Ethan Peterson 2020-02-19 10:00:22 -05:00
commit a7bf713732
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
openmc/surface.py
View file

@ -19,7 +19,7 @@ _WARNING_UPPER = """\
will not accept the capitalized version.\
"""
_WARNING_KWARGS = """
_WARNING_KWARGS = """\
"{}(...) accepts keyword arguments only for '{}'. Future versions of OpenMC \
will not accept positional parameters for superclass arguments.\
"""
@ -220,7 +220,7 @@ class Surface(IDManagerMixin, metaclass=ABCMeta):
coeffs1 = self.normalize(self._get_base_coeffs())
coeffs2 = self.normalize(other._get_base_coeffs())
return np.all(np.isclose(coeffs1, coeffs2, rtol=0., atol=self._atol))
return np.allclose(coeffs1, coeffs2, rtol=0., atol=self._atol)
@abstractmethod
def _get_base_coeffs(self):
@ -630,10 +630,10 @@ class XPlane(PlaneMixin, Surface):
_coeff_keys = ('x0',)
def __init__(self, x0=0., *args, **kwargs):
# work around for accepting Surface kwargs as positional parameters
# work around for accepting Surface kwargs as positional parameters
# until they are deprecated
argsdict = dict(zip(('boundary_type', 'name', 'surface_id'), args))
for k, v in argsdict.items():
for k in argsdict:
warn(_WARNING_KWARGS.format(type(self).__name__, k), FutureWarning)
kwargs.update(argsdict)
@ -710,10 +710,10 @@ class YPlane(PlaneMixin, Surface):
_coeff_keys = ('y0',)
def __init__(self, y0=0., *args, **kwargs):
# work around for accepting Surface kwargs as positional parameters
# work around for accepting Surface kwargs as positional parameters
# until they are deprecated
argsdict = dict(zip(('boundary_type', 'name', 'surface_id'), args))
for k in argsdict.keys():
for k in argsdict:
warn(_WARNING_KWARGS.format(type(self).__name__, k), FutureWarning)
kwargs.update(argsdict)
@ -790,10 +790,10 @@ class ZPlane(PlaneMixin, Surface):
_coeff_keys = ('z0',)
def __init__(self, z0=0., *args, **kwargs):
# work around for accepting Surface kwargs as positional parameters
# work around for accepting Surface kwargs as positional parameters
# until they are deprecated
argsdict = dict(zip(('boundary_type', 'name', 'surface_id'), args))
for k in argsdict.keys():
for k in argsdict:
warn(_WARNING_KWARGS.format(type(self).__name__, k), FutureWarning)
kwargs.update(argsdict)
@ -852,8 +852,8 @@ class QuadricMixin(metaclass=ABCMeta):
else:
a, b, c, d, e, f, g, h, j, k = coeffs
A = np.asarray([[a, d/2, f/2], [d/2, b, e/2], [f/2, e/2, c]])
bvec = np.asarray([g, h, j])
A = np.array([[a, d/2, f/2], [d/2, b, e/2], [f/2, e/2, c]])
bvec = np.array([g, h, j])
return A, bvec, k
@ -1003,7 +1003,7 @@ class Cylinder(QuadricMixin, Surface):
"""
_type = 'cylinder'
_coeff_keys = ('x0', 'y0', 'z0', 'r', 'dx', 'dy','dz')
_coeff_keys = ('x0', 'y0', 'z0', 'r', 'dx', 'dy', 'dz')
def __init__(self, x0=0., y0=0., z0=0., r=1., dx=0., dy=0., dz=1., **kwargs):
raise NotImplementedError('There is no C++ implementation for general '

1
tests/regression_tests/deplete/example_geometry.py
View file

@ -188,7 +188,6 @@ def segment_pin(n_rings, n_wedges, r_fuel, r_gap, r_clad):
fuel_wedges = [openmc.Plane(a=math.cos(theta[i]), b=math.sin(theta[i]))
for i in range(n_wedges)]
print(fuel_wedges)
gap_ring = openmc.ZCylinder(x0=0, y0=0, r=r_gap)
clad_ring = openmc.ZCylinder(x0=0, y0=0, r=r_clad)