Merge branch 'dev' into feat/plotImage-curvilinear

# Conflicts:
#	SimPEG/Examples/__init__.py
This commit is contained in:
Lindsey Heagy
2016-05-29 16:43:40 -07:00
67 changed files with 5190 additions and 536 deletions
+1 -1
View File
@@ -218,7 +218,7 @@ class TensorView(object):
return out
viewOpts = ['real','imag','abs','vec']
normalOpts = ['X', 'Y', 'Z']
vTypeOpts = ['CC', 'CCv','F','E','Fx','Fy','Fz','E','Ex','Ey','Ez']
vTypeOpts = ['CC', 'CCv','N','F','E','Fx','Fy','Fz','E','Ex','Ey','Ez']
# Some user error checking
assert vType in vTypeOpts, "vType must be in ['%s']" % "','".join(vTypeOpts)