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

replaced mapped lambdas with inline for loops

Browse source
This commit is contained in:
samuel shaner 2016-07-29 21:22:16 +00:00
parent 3986a20b13
commit 102edb6d65
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
openmc/mgxs/mgxs.py
View file

@ -694,7 +694,7 @@ class MGXS(object):
# NOTE: This is important if tally merging was used
if self.domain_type == 'mesh':
filters = [self.domain_type]
xyz = map(lambda x: np.arange(1, x+1), self.domain.dimension)
xyz = [np.arange(1, x+1) for x in self.domain.dimension]
filter_bins = [tuple(itertools.product(*xyz))]
elif self.domain_type != 'distribcell':
filters = [self.domain_type]
@ -1157,7 +1157,7 @@ class MGXS(object):
elif self.domain_type == 'distribcell':
subdomains = np.arange(self.num_subdomains, dtype=np.int)
elif self.domain_type == 'mesh':
xyz = map(lambda x: np.arange(1, x+1), self.domain.dimension)
xyz = [np.arange(1, x+1) for x in self.domain.dimension]
subdomains = list(itertools.product(*xyz))
else:
subdomains = [self.domain.id]
@ -1295,7 +1295,7 @@ class MGXS(object):
domain_filter = self.xs_tally.find_filter('avg(distribcell)')
subdomains = domain_filter.bins
elif self.domain_type == 'mesh':
xyz = map(lambda x: np.arange(1, x+1), self.domain.dimension)
xyz = [np.arange(1, x+1) for x in self.domain.dimension]
subdomains = list(itertools.product(*xyz))
else:
subdomains = [self.domain.id]
@ -1924,7 +1924,7 @@ class MatrixMGXS(MGXS):
elif self.domain_type == 'distribcell':
subdomains = np.arange(self.num_subdomains, dtype=np.int)
elif self.domain_type == 'mesh':
xyz = map(lambda x: np.arange(1, x+1), self.domain.dimension)
xyz = [np.arange(1, x+1) for x in self.domain.dimension]
subdomains = list(itertools.product(*xyz))
else:
subdomains = [self.domain.id]
@ -3773,7 +3773,7 @@ class ScatterMatrixXS(MatrixMGXS):
elif self.domain_type == 'distribcell':
subdomains = np.arange(self.num_subdomains, dtype=np.int)
elif self.domain_type == 'mesh':
xyz = map(lambda x: np.arange(1, x+1), self.domain.dimension)
xyz = [np.arange(1, x+1) for x in self.domain.dimension]
subdomains = list(itertools.product(*xyz))
else:
subdomains = [self.domain.id]

2
openmc/tallies.py
View file

@ -1293,7 +1293,7 @@ class Tally(object):
# Create list of 2- or 3-tuples tuples for mesh cell bins
if self_filter.type == 'mesh':
dimension = self_filter.mesh.dimension
xyz = map(lambda x: np.arange(1, x+1), dimension)
xyz = [np.arange(1, x+1) for x in dimension]
bins = list(itertools.product(*xyz))
# Create list of 2-tuples for energy boundary bins