Merge pull request #329 from simpeg/em/dev

Em/dev into mt/dev
2026-09-11 12:44:29 +08:00 · 2016-06-01 11:17:19 -07:00
parent abc5d72725 382b31bd12
commit 0a44796d4c
85 changed files with 7335 additions and 1204 deletions
@@ -21,10 +21,9 @@ class TensorMeshIO(object):
                if '*' in seg:
                    st = seg
                    sp = seg.split('*')
-                    re = np.array(sp[0],dtype=int)*(' ' + sp[1])
+                    re = int(sp[0])*(' ' + sp[1])
                    line = line.replace(st,re.strip())
            return np.array(line.split(),dtype=float)
-
        # Read the file as line strings, remove lines with comment = !
        msh = np.genfromtxt(fileName,delimiter='\n',dtype=np.str,comments='!')