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

Fixed merge conflicts

Browse source
This commit is contained in:
Will Boyd 2015-10-04 00:32:19 -04:00
commit f2ccf96ff0
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openmc/summary.py
View file

@ -72,6 +72,9 @@ class Summary(object):
nuc_densities = self._f['materials'][key]['nuclide_densities'][...]
nuclides = self._f['materials'][key]['nuclides'].value
# Create the Material
material = openmc.Material(material_id=material_id, name=name)
# Read the names of the S(a,b) tables for this Material and add them
if 'sab_names' in self._f['materials'][key]:
sab_tables = self._f['materials'][key]['sab_names'].value
@ -79,9 +82,6 @@ class Summary(object):
name, xs = sab_table.decode().split('.')
material.add_s_alpha_beta(name, xs)
# Create the Material
material = openmc.Material(material_id=material_id, name=name)
# Set the Material's density to atom/b-cm as used by OpenMC
material.set_density(density=density, units='atom/b-cm')

4
tests/run_tests.py
View file

@ -128,10 +128,8 @@ class Test(object):
if self.mpi:
if os.path.exists(os.path.join(MPI_DIR, 'bin', 'mpifort')):
self.fc = os.path.join(MPI_DIR, 'bin', 'mpifort')
elif os.path.exists(os.path.join(MPI_DIR, 'bin', 'mpif90')):
self.fc = os.path.join(MPI_DIR, 'bin', 'mpif90')
else:
raise RuntimeError('Cannot find an MPI Fortran compiler')
self.fc = os.path.join(MPI_DIR, 'bin', 'mpif90')
else:
self.fc = FC