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

Merge pull request #493 from wbinventor/mgxs-int-domain-indices

Browse source 
Fixed deprecated NumPy warning in MGXS.get_xs(...)
This commit is contained in:
Paul Romano 2015-11-03 10:00:26 -06:00
commit 39e246ed38
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openmc/material.py
View file

@ -193,7 +193,7 @@ class Material(object):
name, basestring)
self._name = name
else:
self._name = None
self._name = ''
def set_density(self, units, density=NO_DENSITY):
"""Set the density of the material

2
openmc/mesh.py
View file

@ -155,7 +155,7 @@ class Mesh(object):
name, basestring)
self._name = name
else:
self._name = None
self._name = ''
@type.setter
def type(self, meshtype):

6
openmc/mgxs/mgxs.py
View file

@ -673,7 +673,7 @@ class MGXS(object):
num_groups = len(groups)
# Reshape tally data array with separate axes for domain and energy
num_subdomains = xs.shape[0] / num_groups
num_subdomains = int(xs.shape[0] / num_groups)
new_shape = (num_subdomains, num_groups) + xs.shape[1:]
xs = np.reshape(xs, new_shape)
@ -1844,7 +1844,7 @@ class ScatterMatrixXS(MGXS):
num_out_groups = len(out_groups)
# Reshape tally data array with separate axes for domain and energy
num_subdomains = xs.shape[0] / (num_in_groups * num_out_groups)
num_subdomains = int(xs.shape[0] / (num_in_groups * num_out_groups))
new_shape = (num_subdomains, num_in_groups, num_out_groups)
new_shape += xs.shape[1:]
xs = np.reshape(xs, new_shape)
@ -2194,7 +2194,7 @@ class Chi(MGXS):
num_groups = self.num_groups
else:
num_groups = len(groups)
num_subdomains = xs.shape[0] / num_groups
num_subdomains = int(xs.shape[0] / num_groups)
new_shape = (num_subdomains, num_groups) + xs.shape[1:]
xs = np.reshape(xs, new_shape)

2
openmc/surface.py
View file

@ -128,7 +128,7 @@ class Surface(object):
check_type('surface name', name, basestring)
self._name = name
else:
self._name = None
self._name = ''
@boundary_type.setter
def boundary_type(self, boundary_type):

2
openmc/tallies.py
View file

@ -420,7 +420,7 @@ class Tally(object):
cv.check_type('tally name', name, basestring)
self._name = name
else:
self._name = None
self._name = ''
def add_filter(self, filter):
"""Add a filter to the tally

6
openmc/universe.py
View file

@ -153,7 +153,7 @@ class Cell(object):
cv.check_type('cell name', name, basestring)
self._name = name
else:
self._name = None
self._name = ''
@fill.setter
def fill(self, fill):
@ -472,7 +472,7 @@ class Universe(object):
cv.check_type('universe name', name, basestring)
self._name = name
else:
self._name = None
self._name = ''
def add_cell(self, cell):
"""Add a cell to the universe.
@ -732,7 +732,7 @@ class Lattice(object):
cv.check_type('lattice name', name, basestring)
self._name = name
else:
self._name = None
self._name = ''
@outer.setter
def outer(self, outer):