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 branch 'develop' into iso-lab

Browse source
This commit is contained in:
Will Boyd 2015-05-28 20:50:25 -07:00
commit 4ec5d38317
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/utils/openmc/opencg_compatible.py
View file

@ -1,7 +1,12 @@
import copy
import numpy as np
import opencg
try:
import opencg
except ImportError:
msg = 'Unable to import opencg which is needed by openmc.opencg_compatible'
raise ImportError(msg)
import openmc

11
src/utils/openmc/summary.py
View file

@ -1,12 +1,11 @@
import numpy as np
import openmc
from openmc.opencg_compatible import get_opencg_geometry
try:
import h5py
except ImportError:
msg = 'Unable to import h5py which is necessary for openmc.summary'
msg = 'Unable to import h5py which is needed by openmc.summary'
raise ImportError(msg)
@ -552,6 +551,14 @@ class Summary(object):
def make_opencg_geometry(self):
try:
from openmc.opencg_compatible import get_opencg_geometry
except ImportError:
msg = 'Unable to import opencg which is needed ' \
'by Summary.make_opencg_geometry()'
raise ImportError(msg)
if self.opencg_geometry is None:
self.opencg_geometry = get_opencg_geometry(self.openmc_geometry)