Merge pull request #394 from wbinventor/try-catch-opencg

Try-Catch for OpenCG import statements
This commit is contained in:
Paul Romano 2015-05-29 10:18:50 +07:00
commit 00c1ced575
2 changed files with 15 additions and 3 deletions

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

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)