diff --git a/simpegEM/FDEM/FDEM.py b/simpegEM/FDEM/FDEM.py index 4638936b..6f74eb9c 100644 --- a/simpegEM/FDEM/FDEM.py +++ b/simpegEM/FDEM/FDEM.py @@ -453,13 +453,13 @@ class ProblemFDEM_j(BaseFDEMProblem): if fieldType == 'j': return j elif fieldType == 'h': - mui = self.MeMuI + MeMuI = self.MeMuI C = self.mesh.edgeCurl MfSigi = self.MfSigmai if not adjoint: - h = -(1./(1j*omega(freq))) * mui * ( C.T * ( MfSigi * j ) ) + h = -(1./(1j*omega(freq))) * MeMuI * ( C.T * ( MfSigi * j ) ) else: - h = -(1./(1j*omega(freq))) * MfSigi * ( C * ( mui.T * j ) ) + h = -(1./(1j*omega(freq))) * MfSigi.T * ( C * ( MeMuI.T * j ) ) return h raise NotImplementedError('fieldType "%s" is not implemented.' % fieldType) @@ -618,8 +618,7 @@ class ProblemFDEM_h(BaseFDEMProblem): # MfSigi = self.MfSigmai return C.T*h - # return -1j * omega(freq) * MeMu.T * (MfSigmaiinv * (CTinv * h)) - return C*h #- j_s # -iomega(freq) inv(MfSigmai) inv(C.T) MeMu + return C*h - j_s elif fieldType == 'h': return h raise NotImplementedError('fieldType "%s" is not implemented.' % fieldType) @@ -630,41 +629,12 @@ class ProblemFDEM_h(BaseFDEMProblem): if fieldType == 'j': C = self.mesh.edgeCurl - # MeMu = self.MeMu - # MfSigi = self.MfSigmai - - # if adjoint: - # MfSigiTCinv = self.Solver(MfSigi.T*C, **self.solverOpts) - # MeMu.T * (Cinv * (MfSigmaiTinv * h)) - # v1 = MeMu.T *( Cinv *(MfSigmaiTinv * v)) - # pt1 = -1j * omega(freq) * self.calcFieldsDeriv(h,freq,'h',v,adjoint=True) - - # pt2 = 1j * omega(freq) * dsig_dm.T * ( dsigi_dsig.T * ( dMf_dsigi.T * ( MfSigiTCinv * v) ) ) - # return pt1 + pt2 - - # CTMfSigiinv = self.Solver(C.T*MfSigi, **self.solverOpts) - # hDeriv = self.calcFieldsDeriv(h,freq,'h',v,adjoint=False) - - # pt1 = -1j * omega(freq) * (CTMfSigiinv * (MeMu * hDeriv)) - - # sig = self.curModel.transform - # sigi = 1/sig - # dsig_dm = self.curModel.transformDeriv - # dsigi_dsig = -Utils.sdiag(sigi)**2 - - # v1 = CTMfSigiinv * (MeMu * h) - - # dMf_dsigi = self.mesh.getFaceInnerProductDeriv(sigi)(v1) - - # pt2 = 1j * omega(freq) * (CTMfSigiinv * (dMf_dsigi * (dsigi_dsig * (dsig_dm * v)))) - - # return pt1+pt2 + j_s = self.getjs(freq) if adjoint: dh = self.calcFieldsDeriv(h,freq,'h',C.T*v,adjoint=True) return dh dh = self.calcFieldsDeriv(h,freq,'h',v) - return C*dh - raise NotImplementedError('fieldType "%s" is not implemented.' % fieldType) + return C*dh - j_s elif fieldType == 'h': if adjoint: diff --git a/simpegEM/Tests/test_FDEM.py b/simpegEM/Tests/test_FDEM.py index ffbed6a6..a59cd470 100644 --- a/simpegEM/Tests/test_FDEM.py +++ b/simpegEM/Tests/test_FDEM.py @@ -5,10 +5,10 @@ import sys from scipy.constants import mu_0 TOL = 1e-4 -FLR = 1e-15 # "zero", so if residual below this --> pass regardless of order +FLR = 1e-20 # "zero", so if residual below this --> pass regardless of order CONDUCTIVITY = 1e1 MU = mu_0 -freq = 1 +freq = 1e-1 addrandoms = True # important to addrandoms if testing HJ formulation with VMD source! (or else jz ~ 0) def getProblem(fdemType, comp): @@ -22,14 +22,13 @@ def getProblem(fdemType, comp): mapping = Maps.ExpMap(mesh) - x = np.linspace(-30,30,6) - XYZ = Utils.ndgrid(x,x,np.r_[0]) + x = np.array([np.linspace(-30,-15,3),np.linspace(15,30,3)]) #don't sample right by the transmitter + XYZ = Utils.ndgrid(x,x,np.r_[0.]) Rx0 = EM.FDEM.RxFDEM(XYZ, comp) Tx0 = EM.FDEM.TxFDEM(np.r_[0.,0.,0.], 'VMD', freq, [Rx0]) survey = EM.FDEM.SurveyFDEM([Tx0]) - print fdemType if fdemType == 'e': prb = EM.FDEM.ProblemFDEM_e(mesh, mapping=mapping) @@ -99,7 +98,7 @@ def crossCheckTest(fdemType, comp): prb1 = getProblem(fdemType, comp) mesh = prb1.mesh - print '%s formulation - %s' % (fdemType, comp) + print 'Cross Checking Forward: %s formulation - %s' % (fdemType, comp) m = np.log(np.ones(mesh.nC)*CONDUCTIVITY) mu = np.log(np.ones(mesh.nC)*MU) @@ -145,212 +144,212 @@ def crossCheckTest(fdemType, comp): class FDEM_DerivTests(unittest.TestCase): - # def test_Jvec_exr_Eform(self): - # self.assertTrue(derivTest('e', 'exr')) - # def test_Jvec_exr_Bform(self): - # self.assertTrue(derivTest('b', 'exr')) - # def test_Jvec_eyr_Eform(self): - # self.assertTrue(derivTest('e', 'eyr')) - # def test_Jvec_eyr_Bform(self): - # self.assertTrue(derivTest('b', 'eyr')) - # def test_Jvec_ezr_Eform(self): - # self.assertTrue(derivTest('e', 'ezr')) - # def test_Jvec_ezr_Bform(self): - # self.assertTrue(derivTest('b', 'ezr')) - # def test_Jvec_exi_Eform(self): - # self.assertTrue(derivTest('e', 'exi')) - # def test_Jvec_exi_Bform(self): - # self.assertTrue(derivTest('b', 'exi')) - # def test_Jvec_eyi_Eform(self): - # self.assertTrue(derivTest('e', 'eyi')) - # def test_Jvec_eyi_Bform(self): - # self.assertTrue(derivTest('b', 'eyi')) - # def test_Jvec_ezi_Eform(self): - # self.assertTrue(derivTest('e', 'ezi')) - # def test_Jvec_ezi_Bform(self): - # self.assertTrue(derivTest('b', 'ezi')) + def test_Jvec_exr_Eform(self): + self.assertTrue(derivTest('e', 'exr')) + def test_Jvec_exr_Bform(self): + self.assertTrue(derivTest('b', 'exr')) + def test_Jvec_eyr_Eform(self): + self.assertTrue(derivTest('e', 'eyr')) + def test_Jvec_eyr_Bform(self): + self.assertTrue(derivTest('b', 'eyr')) + def test_Jvec_ezr_Eform(self): + self.assertTrue(derivTest('e', 'ezr')) + def test_Jvec_ezr_Bform(self): + self.assertTrue(derivTest('b', 'ezr')) + def test_Jvec_exi_Eform(self): + self.assertTrue(derivTest('e', 'exi')) + def test_Jvec_exi_Bform(self): + self.assertTrue(derivTest('b', 'exi')) + def test_Jvec_eyi_Eform(self): + self.assertTrue(derivTest('e', 'eyi')) + def test_Jvec_eyi_Bform(self): + self.assertTrue(derivTest('b', 'eyi')) + def test_Jvec_ezi_Eform(self): + self.assertTrue(derivTest('e', 'ezi')) + def test_Jvec_ezi_Bform(self): + self.assertTrue(derivTest('b', 'ezi')) - # def test_Jvec_bxr_Eform(self): - # self.assertTrue(derivTest('e', 'bxr')) - # def test_Jvec_bxr_Bform(self): - # self.assertTrue(derivTest('b', 'bxr')) - # def test_Jvec_byr_Eform(self): - # self.assertTrue(derivTest('e', 'byr')) - # def test_Jvec_byr_Bform(self): - # self.assertTrue(derivTest('b', 'byr')) - # def test_Jvec_bzr_Eform(self): - # self.assertTrue(derivTest('e', 'bzr')) - # def test_Jvec_bzr_Bform(self): - # self.assertTrue(derivTest('b', 'bzr')) - # def test_Jvec_bxi_Eform(self): - # self.assertTrue(derivTest('e', 'bxi')) - # def test_Jvec_bxi_Bform(self): - # self.assertTrue(derivTest('b', 'bxi')) - # def test_Jvec_byi_Eform(self): - # self.assertTrue(derivTest('e', 'byi')) - # def test_Jvec_byi_Bform(self): - # self.assertTrue(derivTest('b', 'byi')) - # def test_Jvec_bzi_Eform(self): - # self.assertTrue(derivTest('e', 'bzi')) - # def test_Jvec_bzi_Bform(self): - # self.assertTrue(derivTest('b', 'bzi')) + def test_Jvec_bxr_Eform(self): + self.assertTrue(derivTest('e', 'bxr')) + def test_Jvec_bxr_Bform(self): + self.assertTrue(derivTest('b', 'bxr')) + def test_Jvec_byr_Eform(self): + self.assertTrue(derivTest('e', 'byr')) + def test_Jvec_byr_Bform(self): + self.assertTrue(derivTest('b', 'byr')) + def test_Jvec_bzr_Eform(self): + self.assertTrue(derivTest('e', 'bzr')) + def test_Jvec_bzr_Bform(self): + self.assertTrue(derivTest('b', 'bzr')) + def test_Jvec_bxi_Eform(self): + self.assertTrue(derivTest('e', 'bxi')) + def test_Jvec_bxi_Bform(self): + self.assertTrue(derivTest('b', 'bxi')) + def test_Jvec_byi_Eform(self): + self.assertTrue(derivTest('e', 'byi')) + def test_Jvec_byi_Bform(self): + self.assertTrue(derivTest('b', 'byi')) + def test_Jvec_bzi_Eform(self): + self.assertTrue(derivTest('e', 'bzi')) + def test_Jvec_bzi_Bform(self): + self.assertTrue(derivTest('b', 'bzi')) - # def test_Jtvec_adjointTest_exr_Eform(self): - # self.assertTrue(adjointTest('e', 'exr')) - # def test_Jtvec_adjointTest_exr_Bform(self): - # self.assertTrue(adjointTest('b', 'exr')) - # def test_Jtvec_adjointTest_eyr_Eform(self): - # self.assertTrue(adjointTest('e', 'eyr')) - # def test_Jtvec_adjointTest_eyr_Bform(self): - # self.assertTrue(adjointTest('b', 'eyr')) - # def test_Jtvec_adjointTest_ezr_Eform(self): - # self.assertTrue(adjointTest('e', 'ezr')) - # def test_Jtvec_adjointTest_ezr_Bform(self): - # self.assertTrue(adjointTest('b', 'ezr')) - # def test_Jtvec_adjointTest_exi_Eform(self): - # self.assertTrue(adjointTest('e', 'exi')) - # def test_Jtvec_adjointTest_exi_Bform(self): - # self.assertTrue(adjointTest('b', 'exi')) - # def test_Jtvec_adjointTest_eyi_Eform(self): - # self.assertTrue(adjointTest('e', 'eyi')) - # def test_Jtvec_adjointTest_eyi_Bform(self): - # self.assertTrue(adjointTest('b', 'eyi')) - # def test_Jtvec_adjointTest_ezi_Eform(self): - # self.assertTrue(adjointTest('e', 'ezi')) - # def test_Jtvec_adjointTest_ezi_Bform(self): - # self.assertTrue(adjointTest('b', 'ezi')) + def test_Jtvec_adjointTest_exr_Eform(self): + self.assertTrue(adjointTest('e', 'exr')) + def test_Jtvec_adjointTest_exr_Bform(self): + self.assertTrue(adjointTest('b', 'exr')) + def test_Jtvec_adjointTest_eyr_Eform(self): + self.assertTrue(adjointTest('e', 'eyr')) + def test_Jtvec_adjointTest_eyr_Bform(self): + self.assertTrue(adjointTest('b', 'eyr')) + def test_Jtvec_adjointTest_ezr_Eform(self): + self.assertTrue(adjointTest('e', 'ezr')) + def test_Jtvec_adjointTest_ezr_Bform(self): + self.assertTrue(adjointTest('b', 'ezr')) + def test_Jtvec_adjointTest_exi_Eform(self): + self.assertTrue(adjointTest('e', 'exi')) + def test_Jtvec_adjointTest_exi_Bform(self): + self.assertTrue(adjointTest('b', 'exi')) + def test_Jtvec_adjointTest_eyi_Eform(self): + self.assertTrue(adjointTest('e', 'eyi')) + def test_Jtvec_adjointTest_eyi_Bform(self): + self.assertTrue(adjointTest('b', 'eyi')) + def test_Jtvec_adjointTest_ezi_Eform(self): + self.assertTrue(adjointTest('e', 'ezi')) + def test_Jtvec_adjointTest_ezi_Bform(self): + self.assertTrue(adjointTest('b', 'ezi')) - # def test_Jtvec_adjointTest_bxr_Eform(self): - # self.assertTrue(adjointTest('e', 'bxr')) - # def test_Jtvec_adjointTest_bxr_Bform(self): - # self.assertTrue(adjointTest('b', 'bxr')) - # def test_Jtvec_adjointTest_byr_Eform(self): - # self.assertTrue(adjointTest('e', 'byr')) - # def test_Jtvec_adjointTest_byr_Bform(self): - # self.assertTrue(adjointTest('b', 'byr')) - # def test_Jtvec_adjointTest_bzr_Eform(self): - # self.assertTrue(adjointTest('e', 'bzr')) - # def test_Jtvec_adjointTest_bzr_Bform(self): - # self.assertTrue(adjointTest('b', 'bzr')) - # def test_Jtvec_adjointTest_bxi_Eform(self): - # self.assertTrue(adjointTest('e', 'bxi')) - # def test_Jtvec_adjointTest_bxi_Bform(self): - # self.assertTrue(adjointTest('b', 'bxi')) - # def test_Jtvec_adjointTest_byi_Eform(self): - # self.assertTrue(adjointTest('e', 'byi')) - # def test_Jtvec_adjointTest_byi_Bform(self): - # self.assertTrue(adjointTest('b', 'byi')) - # def test_Jtvec_adjointTest_bzi_Eform(self): - # self.assertTrue(adjointTest('e', 'bzi')) - # def test_Jtvec_adjointTest_bzi_Bform(self): - # self.assertTrue(adjointTest('b', 'bzi')) + def test_Jtvec_adjointTest_bxr_Eform(self): + self.assertTrue(adjointTest('e', 'bxr')) + def test_Jtvec_adjointTest_bxr_Bform(self): + self.assertTrue(adjointTest('b', 'bxr')) + def test_Jtvec_adjointTest_byr_Eform(self): + self.assertTrue(adjointTest('e', 'byr')) + def test_Jtvec_adjointTest_byr_Bform(self): + self.assertTrue(adjointTest('b', 'byr')) + def test_Jtvec_adjointTest_bzr_Eform(self): + self.assertTrue(adjointTest('e', 'bzr')) + def test_Jtvec_adjointTest_bzr_Bform(self): + self.assertTrue(adjointTest('b', 'bzr')) + def test_Jtvec_adjointTest_bxi_Eform(self): + self.assertTrue(adjointTest('e', 'bxi')) + def test_Jtvec_adjointTest_bxi_Bform(self): + self.assertTrue(adjointTest('b', 'bxi')) + def test_Jtvec_adjointTest_byi_Eform(self): + self.assertTrue(adjointTest('e', 'byi')) + def test_Jtvec_adjointTest_byi_Bform(self): + self.assertTrue(adjointTest('b', 'byi')) + def test_Jtvec_adjointTest_bzi_Eform(self): + self.assertTrue(adjointTest('e', 'bzi')) + def test_Jtvec_adjointTest_bzi_Bform(self): + self.assertTrue(adjointTest('b', 'bzi')) - # def test_Jvec_jxr_Jform(self): - # self.assertTrue(derivTest('j', 'jxr')) - # def test_Jvec_jyr_Jform(self): - # self.assertTrue(derivTest('j', 'jyr')) - # def test_Jvec_jzr_Jform(self): - # self.assertTrue(derivTest('j', 'jzr')) - # def test_Jvec_jxi_Jform(self): - # self.assertTrue(derivTest('j', 'jxi')) - # def test_Jvec_jyi_Jform(self): - # self.assertTrue(derivTest('j', 'jyi')) - # def test_Jvec_jzi_Jform(self): - # self.assertTrue(derivTest('j', 'jzi')) + def test_Jvec_jxr_Jform(self): + self.assertTrue(derivTest('j', 'jxr')) + def test_Jvec_jyr_Jform(self): + self.assertTrue(derivTest('j', 'jyr')) + def test_Jvec_jzr_Jform(self): + self.assertTrue(derivTest('j', 'jzr')) + def test_Jvec_jxi_Jform(self): + self.assertTrue(derivTest('j', 'jxi')) + def test_Jvec_jyi_Jform(self): + self.assertTrue(derivTest('j', 'jyi')) + def test_Jvec_jzi_Jform(self): + self.assertTrue(derivTest('j', 'jzi')) - # def test_Jvec_hxr_Jform(self): - # self.assertTrue(derivTest('j', 'hxr')) - # def test_Jvec_hyr_Jform(self): - # self.assertTrue(derivTest('j', 'hyr')) - # def test_Jvec_hzr_Jform(self): - # self.assertTrue(derivTest('j', 'hzr')) - # def test_Jvec_hxi_Jform(self): - # self.assertTrue(derivTest('j', 'hxi')) - # def test_Jvec_hyi_Jform(self): - # self.assertTrue(derivTest('j', 'hyi')) - # def test_Jvec_hzi_Jform(self): - # self.assertTrue(derivTest('j', 'hzi')) + def test_Jvec_hxr_Jform(self): + self.assertTrue(derivTest('j', 'hxr')) + def test_Jvec_hyr_Jform(self): + self.assertTrue(derivTest('j', 'hyr')) + def test_Jvec_hzr_Jform(self): + self.assertTrue(derivTest('j', 'hzr')) + def test_Jvec_hxi_Jform(self): + self.assertTrue(derivTest('j', 'hxi')) + def test_Jvec_hyi_Jform(self): + self.assertTrue(derivTest('j', 'hyi')) + def test_Jvec_hzi_Jform(self): + self.assertTrue(derivTest('j', 'hzi')) - # def test_Jvec_hxr_Hform(self): - # self.assertTrue(derivTest('h', 'hxr')) - # def test_Jvec_hyr_Hform(self): - # self.assertTrue(derivTest('h', 'hyr')) - # def test_Jvec_hzr_Hform(self): - # self.assertTrue(derivTest('h', 'hzr')) - # def test_Jvec_hxi_Hform(self): - # self.assertTrue(derivTest('h', 'hxi')) - # def test_Jvec_hyi_Hform(self): - # self.assertTrue(derivTest('h', 'hyi')) - # def test_Jvec_hzi_Hform(self): - # self.assertTrue(derivTest('h', 'hzi')) + def test_Jvec_hxr_Hform(self): + self.assertTrue(derivTest('h', 'hxr')) + def test_Jvec_hyr_Hform(self): + self.assertTrue(derivTest('h', 'hyr')) + def test_Jvec_hzr_Hform(self): + self.assertTrue(derivTest('h', 'hzr')) + def test_Jvec_hxi_Hform(self): + self.assertTrue(derivTest('h', 'hxi')) + def test_Jvec_hyi_Hform(self): + self.assertTrue(derivTest('h', 'hyi')) + def test_Jvec_hzi_Hform(self): + self.assertTrue(derivTest('h', 'hzi')) - # def test_Jvec_hxr_Hform(self): - # self.assertTrue(derivTest('h', 'jxr')) - # def test_Jvec_hyr_Hform(self): - # self.assertTrue(derivTest('h', 'jyr')) - # def test_Jvec_hzr_Hform(self): - # self.assertTrue(derivTest('h', 'jzr')) - # def test_Jvec_hxi_Hform(self): - # self.assertTrue(derivTest('h', 'jxi')) - # def test_Jvec_hyi_Hform(self): - # self.assertTrue(derivTest('h', 'jyi')) - # def test_Jvec_hzi_Hform(self): - # self.assertTrue(derivTest('h', 'jzi')) + def test_Jvec_hxr_Hform(self): + self.assertTrue(derivTest('h', 'jxr')) + def test_Jvec_hyr_Hform(self): + self.assertTrue(derivTest('h', 'jyr')) + def test_Jvec_hzr_Hform(self): + self.assertTrue(derivTest('h', 'jzr')) + def test_Jvec_hxi_Hform(self): + self.assertTrue(derivTest('h', 'jxi')) + def test_Jvec_hyi_Hform(self): + self.assertTrue(derivTest('h', 'jyi')) + def test_Jvec_hzi_Hform(self): + self.assertTrue(derivTest('h', 'jzi')) - # def test_Jtvec_adjointTest_jxr_Jform(self): - # self.assertTrue(adjointTest('j', 'jxr')) - # def test_Jtvec_adjointTest_jyr_Jform(self): - # self.assertTrue(adjointTest('j', 'jyr')) - # def test_Jtvec_adjointTest_jzr_Jform(self): - # self.assertTrue(adjointTest('j', 'jzr')) - # def test_Jtvec_adjointTest_jxi_Jform(self): - # self.assertTrue(adjointTest('j', 'jxi')) - # def test_Jtvec_adjointTest_jyi_Jform(self): - # self.assertTrue(adjointTest('j', 'jyi')) - # def test_Jtvec_adjointTest_jzi_Jform(self): - # self.assertTrue(adjointTest('j', 'jzi')) + def test_Jtvec_adjointTest_jxr_Jform(self): + self.assertTrue(adjointTest('j', 'jxr')) + def test_Jtvec_adjointTest_jyr_Jform(self): + self.assertTrue(adjointTest('j', 'jyr')) + def test_Jtvec_adjointTest_jzr_Jform(self): + self.assertTrue(adjointTest('j', 'jzr')) + def test_Jtvec_adjointTest_jxi_Jform(self): + self.assertTrue(adjointTest('j', 'jxi')) + def test_Jtvec_adjointTest_jyi_Jform(self): + self.assertTrue(adjointTest('j', 'jyi')) + def test_Jtvec_adjointTest_jzi_Jform(self): + self.assertTrue(adjointTest('j', 'jzi')) - # def test_Jtvec_adjointTest_hxr_Jform(self): - # self.assertTrue(adjointTest('j', 'hxr')) - # def test_Jtvec_adjointTest_hyr_Jform(self): - # self.assertTrue(adjointTest('j', 'hyr')) - # def test_Jtvec_adjointTest_hzr_Jform(self): - # self.assertTrue(adjointTest('j', 'hzr')) - # def test_Jtvec_adjointTest_hxi_Jform(self): - # self.assertTrue(adjointTest('j', 'hxi')) - # def test_Jtvec_adjointTest_hyi_Jform(self): - # self.assertTrue(adjointTest('j', 'hyi')) - # def test_Jtvec_adjointTest_hzi_Jform(self): - # self.assertTrue(adjointTest('j', 'hzi')) + def test_Jtvec_adjointTest_hxr_Jform(self): + self.assertTrue(adjointTest('j', 'hxr')) + def test_Jtvec_adjointTest_hyr_Jform(self): + self.assertTrue(adjointTest('j', 'hyr')) + def test_Jtvec_adjointTest_hzr_Jform(self): + self.assertTrue(adjointTest('j', 'hzr')) + def test_Jtvec_adjointTest_hxi_Jform(self): + self.assertTrue(adjointTest('j', 'hxi')) + def test_Jtvec_adjointTest_hyi_Jform(self): + self.assertTrue(adjointTest('j', 'hyi')) + def test_Jtvec_adjointTest_hzi_Jform(self): + self.assertTrue(adjointTest('j', 'hzi')) - # def test_Jtvec_adjointTest_hxr_Hform(self): - # self.assertTrue(adjointTest('h', 'hxr')) - # def test_Jtvec_adjointTest_hyr_Hform(self): - # self.assertTrue(adjointTest('h', 'hyr')) - # def test_Jtvec_adjointTest_hzr_Hform(self): - # self.assertTrue(adjointTest('h', 'hzr')) - # def test_Jtvec_adjointTest_hxi_Hform(self): - # self.assertTrue(adjointTest('h', 'hxi')) - # def test_Jtvec_adjointTest_hyi_Hform(self): - # self.assertTrue(adjointTest('h', 'hyi')) - # def test_Jtvec_adjointTest_hzi_Hform(self): - # self.assertTrue(adjointTest('h', 'hzi')) + def test_Jtvec_adjointTest_hxr_Hform(self): + self.assertTrue(adjointTest('h', 'hxr')) + def test_Jtvec_adjointTest_hyr_Hform(self): + self.assertTrue(adjointTest('h', 'hyr')) + def test_Jtvec_adjointTest_hzr_Hform(self): + self.assertTrue(adjointTest('h', 'hzr')) + def test_Jtvec_adjointTest_hxi_Hform(self): + self.assertTrue(adjointTest('h', 'hxi')) + def test_Jtvec_adjointTest_hyi_Hform(self): + self.assertTrue(adjointTest('h', 'hyi')) + def test_Jtvec_adjointTest_hzi_Hform(self): + self.assertTrue(adjointTest('h', 'hzi')) - # def test_Jtvec_adjointTest_hxr_Hform(self): - # self.assertTrue(adjointTest('h', 'jxr')) - # def test_Jtvec_adjointTest_hyr_Hform(self): - # self.assertTrue(adjointTest('h', 'jyr')) - # def test_Jtvec_adjointTest_hzr_Hform(self): - # self.assertTrue(adjointTest('h', 'jzr')) - # def test_Jtvec_adjointTest_hxi_Hform(self): - # self.assertTrue(adjointTest('h', 'jxi')) - # def test_Jtvec_adjointTest_hyi_Hform(self): - # self.assertTrue(adjointTest('h', 'jyi')) - # def test_Jtvec_adjointTest_hzi_Hform(self): - # self.assertTrue(adjointTest('h', 'jzi')) + def test_Jtvec_adjointTest_hxr_Hform(self): + self.assertTrue(adjointTest('h', 'jxr')) + def test_Jtvec_adjointTest_hyr_Hform(self): + self.assertTrue(adjointTest('h', 'jyr')) + def test_Jtvec_adjointTest_hzr_Hform(self): + self.assertTrue(adjointTest('h', 'jzr')) + def test_Jtvec_adjointTest_hxi_Hform(self): + self.assertTrue(adjointTest('h', 'jxi')) + def test_Jtvec_adjointTest_hyi_Hform(self): + self.assertTrue(adjointTest('h', 'jyi')) + def test_Jtvec_adjointTest_hzi_Hform(self): + self.assertTrue(adjointTest('h', 'jzi')) def test_EB_CrossCheck_exr_Eform(self):