Fixed osr import in ediFilesUtils, moved into class which imports only on build up.

Fixed the boolean error in Directives.
This commit is contained in:
GudniRos
2016-04-07 08:46:51 -07:00
parent b4f329f65a
commit fb60f45a3c
2 changed files with 12 additions and 8 deletions
+1 -1
View File
@@ -255,7 +255,7 @@ class SaveOutputDictEveryIteration(_SaveEveryIteration):
mref = 0
mx = self.reg.Wx * ( self.reg.mapping * (self.invProb.curModel - mref) )
phi_mx = 0.5 * mx.dot(mx)
if self.prob.mesh.dim==2:
if self.prob.mesh.dim>2:
my = self.reg.Wy * ( self.reg.mapping * (self.invProb.curModel - mref) )
phi_my = 0.5 * my.dot(my)
else:
+11 -7
View File
@@ -7,17 +7,21 @@ from SimPEG.MT.Utils.dataUtils import rec2ndarr
# Import modules
import numpy as np
import os, sys, re
try:
import osr
except ImportError as e:
print 'Could not import osr, missing the gdal package'
pass
class EDIimporter:
"""
A class to import EDIfiles.
"""
# Import the coordinate projections
try:
import osr
except ImportError as e:
print 'Could not import osr, missing the gdal package'
raise e
# Define data converters
_impUnitEDI2SI = 4*np.pi*1e-4 # Convert Z[mV/km/nT] (as in EDI)to Z[V/A] SI unit
_impUnitSI2EDI = 1./_impUnitEDI2SI # ConvertZ[V/A] SI unit to Z[mV/km/nT] (as in EDI)
@@ -26,8 +30,8 @@ class EDIimporter:
comps = None
# Hidden properties
_outEPSG = None
_2out = None
_outEPSG = None # Project info
_2out = None # The projection operator
def __init__(self, EDIfilesList, compList=None, outEPSG=None):