Latest updates in preparation for merge with SimPEG

simpegPF/Dev/MAG/LogName_blabla.txt

@@ -1,21 +0,0 @@
-  #     beta     phi_d     phi_m       f
-   1 1.4081e+07 1.3177e+01 9.9671e-06 2.8314e+02
-   2 1.4081e+07 1.2333e+01 9.2396e-06 1.5353e+02
-   3 1.4081e+07 1.0202e+01 9.1982e-06 1.4244e+02
-   4 1.4081e+07 1.0662e+01 9.0940e-06 1.3972e+02
-   5 4.4406e+08 9.7668e+00 9.1243e-06 1.3872e+02
-   6 4.4406e+08 3.2344e+02 3.1445e-06 4.0480e+03
-   7 4.4406e+08 5.1839e+02 2.2545e-06 1.7198e+03
-   8 4.4406e+08 5.1121e+02 2.1668e-06 1.5195e+03
-   9 4.4406e+08 5.4030e+02 2.0596e-06 1.4734e+03
-  10 2.4887e+08 5.4956e+02 2.0182e-06 1.4549e+03
-  11 2.4887e+08 3.1821e+02 2.2401e-06 1.0621e+03
-  12 2.4887e+08 2.8746e+02 2.0863e-06 8.7570e+02
-  13 2.4887e+08 2.3223e+02 2.1657e-06 8.0668e+02
-  14 2.4887e+08 2.2477e+02 2.1052e-06 7.7121e+02
-  15 3.9177e+08 1.9565e+02 2.1619e-06 7.4869e+02
-  16 3.9177e+08 2.9301e+02 1.4206e-06 1.0204e+03
-  17 3.9177e+08 2.7202e+02 1.3931e-06 8.4957e+02
-  18 3.9177e+08 2.7366e+02 1.3448e-06 8.1779e+02
-  19 3.9177e+08 2.4196e+02 1.3947e-06 8.0051e+02
-  20 4.9390e+08 2.4431e+02 1.3653e-06 7.8835e+02

simpegPF/Tests/assets/magnetics/PYMAG3D_inv.inp

@@ -0,0 +1,13 @@
+Mesh_10m.msh			! Mesh file
+Obs_loc_TMI.obs			! Obsfile
+Gaussian.topo			! Topofile | null
+ModelStart.sus			! Starting model
+VALUE 0				! Reference model
+ActiveCells.dat			! [ Active file (0:Inactive | 1: Active-Dynamic | -1: Active-Static) ] || [ VALUE ### (from starting model) ] || [ DEFAULT (all Active-Dynamic)]
+DEFAULT !..\AzmDip.dat		! Magnetization vector model
+DEFAULT				! Cell based weight file
+1				! target chi factor | DEFAULT=1
+1 1 1 1				! alpha s, x ,y ,z
+VALUE 0 1			! Lower and Upper Bounds for p-component
+VALUE 0 1 1 1 1			! lp-norm for amplitude inversion FILE pqxqyqzr.dat  ! Norms VALUE p, qx, qy, qz, r | FILE m-by-5 matrix
+DEFAULT		! Threshold value for the norm on model and model gradient VALUE eps_p, eps_q | DEFAULT

simpegPF/Tests/assets/magnetics/SimPEG_MAG3D_inv.inp

@@ -1,11 +0,0 @@
-Mesh_10m.msh			! Mesh file
-Obs_loc_TMI.obs		! Obsfile
-Gaussian.topo			! Topofile | null
-VALUE 1e-4			! Starting model
-VALUE 0			! Reference model
-DEFAULT !..\AzmDip.dat			! Magnetization vector model
-DEFAULT				! Cell based weight file
-1				! target chi factor | DEFAULT=1
-1 1 1 1			! alpha s, x ,y ,z
-VALUE 0 1			! Lower and Upper Bounds for p-component
-VALUE 0 1 1 1 1		! lp-norm for amplitude inversion FILE pqxqyqzr.dat  ! Norms VALUE p, qx, qy, qz, r | FILE m-by-5 matrix

simpegPF/Tests/test_magnetics_IO.py

@@ -4,7 +4,7 @@ from simpegPF import BaseMag
 import matplotlib.pyplot as plt
 import simpegPF as PF
 from scipy.constants import mu_0
-
+import os
 
 
 class MagSensProblemTests(unittest.TestCase):
@@ -14,16 +14,21 @@ class MagSensProblemTests(unittest.TestCase):
 
     def test_magnetics_inversion(self):
 
-        driver = PF.MagneticsDriver.MagneticsDriver_Inv('assets/magnetics/SimPEG_MAG3D_inv.inp')
+        driver = PF.MagneticsDriver.MagneticsDriver_Inv('assets' + os.path.sep + 'magnetics' + os.path.sep + 'PYMAG3D_inv.inp')
 
         print driver.mesh
         print driver.survey
         print driver.m0
         print driver.mref
         print driver.activeCells
-
-
-
+        print driver.staticCells
+        print driver.dynamicCells
+        print driver.chi
+        print driver.nC
+        print driver.alphas
+        print driver.bounds
+        print driver.lpnorms
+        print driver.eps
 
 if __name__ == '__main__':
     unittest.main()