wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-09-09 11:34:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Futurize 1, futurize 2, pasteurize.

Browse Source
This commit is contained in:
Brendan Smithyman
2016-07-16 14:17:02 -05:00
parent 362975d2bd
commit ca8d8f8c2d
197 changed files with 2618 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/dcip/__init__.py
+6
View File
@@ -1,3 +1,9 @@
from __future__ import unicode_literals
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
from future import standard_library
standard_library.install_aliases()
import os
import glob
import unittest
tests/dcip/test_forward_DCproblem.py
+9 -2
View File
@@ -1,3 +1,10 @@
from __future__ import print_function
from __future__ import division
from __future__ import unicode_literals
from __future__ import absolute_import
from future import standard_library
standard_library.install_aliases()
from past.utils import old_div
import unittest
from SimPEG import *
import SimPEG.DCIP as DC
@@ -14,7 +21,7 @@ class DCProblemTests(unittest.TestCase):
cs = surveySize/nElecs/4
mesh = Mesh.TensorMesh([
[(cs,10, -1.3),(cs,surveySize/cs),(cs,10, 1.3)],
[(cs,10, -1.3),(cs,old_div(surveySize,cs)),(cs,10, 1.3)],
[(cs,3, -1.3),(cs,3,1.3)],
# [(cs,5, -1.3),(cs,10)]
],'CN')
@@ -55,7 +62,7 @@ class DCProblemTests(unittest.TestCase):
wtJv = w.dot(self.p.Jvec(self.m0, v))
vtJtw = v.dot(self.p.Jtvec(self.m0, w))
passed = np.abs(wtJv - vtJtw) < 1e-10
print 'Adjoint Test', np.abs(wtJv - vtJtw), passed
print('Adjoint Test', np.abs(wtJv - vtJtw), passed)
self.assertTrue(passed)
def test_dataObj(self):
tests/dcip/test_forward_IPproblem.py
+13 -5
View File
@@ -1,3 +1,11 @@
from __future__ import division
from __future__ import unicode_literals
from __future__ import print_function
from __future__ import absolute_import
from builtins import int
from future import standard_library
standard_library.install_aliases()
from past.utils import old_div
import unittest
import SimPEG.DCIP as DC
from SimPEG import *
@@ -7,10 +15,10 @@ class IPforwardTests(unittest.TestCase):
def test_IPforward(self):
cs = 12.5
nc = 200/cs+1
nc = old_div(200,cs)+1
hx = [(cs,7, -1.3),(cs,nc),(cs,7, 1.3)]
hy = [(cs,7, -1.3),(cs,int(nc/2+1)),(cs,7, 1.3)]
hz = [(cs,7, -1.3),(cs,int(nc/2+1))]
hy = [(cs,7, -1.3),(cs,int(old_div(nc,2)+1)),(cs,7, 1.3)]
hz = [(cs,7, -1.3),(cs,int(old_div(nc,2)+1))]
mesh = Mesh.TensorMesh([hx, hy, hz], 'CCN')
sighalf = 1e-2
sigma = np.ones(mesh.nC)*sighalf
@@ -37,7 +45,7 @@ class IPforwardTests(unittest.TestCase):
try:
from pymatsolver import MumpsSolver
solver = MumpsSolver
except ImportError, e:
except ImportError as e:
solver = SolverLU
problem.Solver = solver
@@ -56,7 +64,7 @@ class IPforwardTests(unittest.TestCase):
phiIP_approx = surveyIP.dpred(eta)
err = np.linalg.norm(phiIP_true-phiIP_approx) / np.linalg.norm(phiIP_true)
err = old_div(np.linalg.norm(phiIP_true-phiIP_approx), np.linalg.norm(phiIP_true))
self.assertTrue(err < 0.02)
tests/dcip/test_sens_IPproblem.py
+13 -5
View File
@@ -1,3 +1,11 @@
from __future__ import print_function
from __future__ import division
from __future__ import unicode_literals
from __future__ import absolute_import
from builtins import int
from future import standard_library
standard_library.install_aliases()
from past.utils import old_div
import unittest
from SimPEG import *
import SimPEG.DCIP as DC
@@ -7,10 +15,10 @@ class IPProblemTests(unittest.TestCase):
def setUp(self):
cs = 12.5
nc = 500/cs+1
nc = old_div(500,cs)+1
hx = [(cs,0, -1.3),(cs,nc),(cs,0, 1.3)]
hy = [(cs,0, -1.3),(cs,int(nc/2+1)),(cs,0, 1.3)]
hz = [(cs,0, -1.3),(cs,int(nc/2+1))]
hy = [(cs,0, -1.3),(cs,int(old_div(nc,2)+1)),(cs,0, 1.3)]
hz = [(cs,0, -1.3),(cs,int(old_div(nc,2)+1))]
mesh = Mesh.TensorMesh([hx, hy, hz], 'CCN')
sighalf = 1e-2
sigma = np.ones(mesh.nC)*sighalf
@@ -35,7 +43,7 @@ class IPProblemTests(unittest.TestCase):
try:
from pymatsolver import MumpsSolver
problem.Solver = MumpsSolver
except ImportError, e:
except ImportError as e:
problem.Solver = SolverLU
mSynth = eta
@@ -69,7 +77,7 @@ class IPProblemTests(unittest.TestCase):
wtJv = w.dot(self.p.Jvec(self.m0, v))
vtJtw = v.dot(self.p.Jtvec(self.m0, w))
passed = np.abs(wtJv - vtJtw) < 1e-10
print 'Adjoint Test', np.abs(wtJv - vtJtw), passed
print('Adjoint Test', np.abs(wtJv - vtJtw), passed)
self.assertTrue(passed)
def test_dataObj(self):