Move sub functions to PF.Magnetics

Add Mag Integral forward operator
Begin Inversion script for magnetic integral

simpegPF/Dev/Archives/fwr_MAG_data.py

@@ -57,7 +57,7 @@ def fwr_MAG_data(mesh,B,M,rxLoc,model,flag):
         d = np.zeros(ndata)
         
     elif flag=='xyz':
-        d = np.zeros((3,ndata))
+        d = np.zeros(int(3*ndata))
         
     # Loop through all observations and create forward operator (ndata-by-mcell)
     print "Begin forward modeling " +str(int(ndata)) + " data points..."
@@ -70,7 +70,7 @@ def fwr_MAG_data(mesh,B,M,rxLoc,model,flag):
         Gxyz = np.vstack((tx,ty,tz))*Mxyz
         
         if flag=='xyz':
-            d[:,ii] = Gxyz.dot(model)
+            d[ii:ndata:] = mkvc(Gxyz.dot(model))
             
         elif flag=='tmi':
             d[ii] = Ptmi.dot(Gxyz.dot(model))

simpegPF/Dev/Archives/get_MAG_F.py

@@ -79,13 +79,13 @@ def fwr_MAG_F(mesh,B,M,rxLoc,flag):
             Mxyz = sp.spdiags(M,0,mesh.nC * 3,mesh.nC * 3)
         
         if flag == 'tmi':
-            F = np.zeros(ndata, mesh.nC)
+            F = np.zeros((ndata, mesh.nC))
             
         elif flag == 'xyz':
-            F = np.zeros(int(3*ndata), mesh.nC)
+            F = np.zeros((int(3*ndata), mesh.nC))
         
     elif flag == 'full':       
-        F = np.zeros(int(3*ndata), int(3*mesh.nC))
+        F = np.zeros((int(3*ndata), int(3*mesh.nC)))
         
     else:
         print """Flag must be either 'tmi' | 'xyz' | 'full', please revised"""

simpegPF/Dev/Intgrl_MAG_Fwr_Driver.py

@@ -8,15 +8,15 @@ os.chdir(home_dir)
 
 #%%
 from SimPEG import np, Utils
-from simpegPF import BaseMag
+import simpegPF as PF
 
 ## New scripts to be added to basecode
-from fwr_MAG_data import fwr_MAG_data
-from read_MAGfwr_inp import read_MAGfwr_inp
+#from fwr_MAG_data import fwr_MAG_data
+#from read_MAGfwr_inp import read_MAGfwr_inp
 
 #%%
 # Read input file
-[mshfile, obsfile, modfile, magfile, topofile] = read_MAGfwr_inp(inpfile)
+[mshfile, obsfile, modfile, magfile, topofile] = PF.BaseMag.read_MAGfwr_inp(inpfile)
 
 # Load mesh file
 mesh = Utils.meshutils.readUBCTensorMesh(mshfile)
@@ -25,13 +25,13 @@ mesh = Utils.meshutils.readUBCTensorMesh(mshfile)
 model = Utils.meshutils.readUBCTensorModel(modfile,mesh)
     
 # Load in observation file
-[B,M,dobs] = BaseMag.readUBCmagObs(obsfile)
+[B,M,dobs] = PF.BaseMag.readUBCmagObs(obsfile)
 
 rxLoc = dobs[:,0:3]
 ndata = rxLoc.shape[0]
 
 # Compute forward model using integral equation
-d = fwr_MAG_data(mesh,B,M,rxLoc,model,'tmi')
+d = PF.Magnetics.Intgrl_Fwr_Data(mesh,B,M,rxLoc,model,'tmi')
 
 # Form data object with coordinates and write to file
 data = np.c_[rxLoc , d , np.zeros((ndata,1))]
@@ -43,6 +43,7 @@ with file('FWR_data.dat','w') as fid:
     fid.write('%i\n' %(ndata) ) 
     np.savetxt(fid, data, fmt='%e',delimiter=' ',newline='\n')
 
+
 print "Observation file saved to " + home_dir + '\FWR_data.dat'
 
 

simpegPF/Dev/Intgrl_MAG_Fwr_SphereTest.py

@@ -8,10 +8,8 @@ os.chdir(home_dir)
 from SimPEG import *
 import matplotlib.pyplot as plt
 import simpegPF as PF
-from simpegPF import BaseMag
-import matplotlib
 
-from fwr_MAG_obs import fwr_MAG_obs
+#from fwr_MAG_data import fwr_MAG_data
 
 plt.close('all')
 
@@ -39,7 +37,7 @@ lrl = np.zeros(d_iter)
 # Create mesh using simpeg and write out in GIF format
 
 for ii in range(d_iter):
-    
+       
     nc = 3**(ii+1)
     
     hxind = [(1./nc, nc)]
@@ -54,6 +52,8 @@ for ii in range(d_iter):
     
     mcell = mesh.nC
     
+    print 'Mesh size: ' + str(mcell)
+    
     sph_ind = PF.MagAnalytics.spheremodel(mesh, 0, 0, 0, R)
     
     chibkg = 0.
@@ -62,10 +62,10 @@ for ii in range(d_iter):
     model[sph_ind] = chiblk
     
     #%% Forward mode ldata
-    d = fwr_MAG_obs(mesh,B,M,rxLoc,model)
-    fwr_x = mkvc(d[0,:])
-    fwr_y = mkvc(d[1,:])
-    fwr_z = mkvc(d[2,:])
+    d = PF.Magnetics.Intgrl_Fwr_Data(mesh,B,M,rxLoc,model,'xyz')
+    fwr_x = d[0:ndata]
+    fwr_y = d[ndata:2*ndata]
+    fwr_z = d[2*ndata:]
     
     #%% Get the analystical answer and compute the residual
     bxa,bya,bza = PF.MagAnalytics.MagSphereAnaFunA(rxLoc[:,0],rxLoc[:,1],rxLoc[:,2],R,0.,0.,0.,chiblk, np.array(([0.,0.,B[2]])),'secondary')
@@ -90,30 +90,32 @@ for ii in range(d_iter):
 
     
 #%% Plot results
+print 'Residual between analytical sphere and integral forward' 
 for ii in range(d_iter):
     nc = 3**(ii+1)
-    print "Residual= " + str(lrl[ii]) + "\t dx= " + str(1./nc)
+
+    print "||r||= " + str(lrl[ii]) + "\t dx= " + str(1./nc)
     
 #%% Plot fields
 
 plt.figure(1)
-ax = plt.subplot(131)
+ax = plt.subplot(221)
 plt.imshow(np.reshape(bxa,X.shape).T, interpolation="bicubic", extent=[xr.min(), xr.max(), yr.min(), yr.max()], origin = 'lower')
-plt.colorbar()
+plt.colorbar(fraction=0.04)
 plt.contour(X,Y, np.reshape(bxa,X.shape).T,10)
 plt.scatter(X,Y, c=np.reshape(bxa,X.shape).T, s=20)
 ax.set_title('Sphere Ana Bx')
 
-ax = plt.subplot(132)
+ax = plt.subplot(222)
 plt.imshow(np.reshape(bya,X.shape).T, interpolation="bicubic", extent=[xr.min(), xr.max(), yr.min(), yr.max()], origin = 'lower')
-plt.colorbar()
+plt.colorbar(fraction=0.04)
 plt.contour(X,Y, np.reshape(bya,X.shape).T,10)
 plt.scatter(X,Y, c=np.reshape(bya,X.shape).T, s=20)
 ax.set_title('Sphere Ana By')
 
-ax = plt.subplot(133)
+ax = plt.subplot(212)
 plt.imshow(np.reshape(bza,X.shape).T, interpolation="bicubic", extent=[xr.min(), xr.max(), yr.min(), yr.max()], origin = 'lower')
-plt.colorbar()
+plt.colorbar(fraction=0.04)
 plt.contour(X,Y, np.reshape(bza,X.shape).T,10)
 plt.scatter(X,Y, c=np.reshape(bza,X.shape).T, s=20)
 ax.set_title('Sphere Ana Bz')
@@ -121,23 +123,23 @@ ax.set_title('Sphere Ana Bz')
 #%% Plot the forward solution from integral
 
 plt.figure(2)
-ax = plt.subplot(131)
+ax = plt.subplot(221)
 plt.imshow(np.reshape(fwr_x,X.shape).T, interpolation="bicubic", extent=[xr.min(), xr.max(), yr.min(), yr.max() ], origin = 'lower')
-plt.colorbar()
+plt.colorbar(fraction=0.04)
 plt.contour(X,Y, np.reshape(fwr_x,X.shape).T,10)
 plt.scatter(X,Y, c=np.reshape(fwr_x,X.shape).T, s=20)
 ax.set_title('Sphere Ana Bx')
 
-ax = plt.subplot(132)
+ax = plt.subplot(222)
 plt.imshow(np.reshape(fwr_y,X.shape).T, interpolation="bicubic", extent=[xr.min(), xr.max(), yr.min(), yr.max()], origin = 'lower')
-plt.colorbar()
+plt.colorbar(fraction=0.04)
 plt.contour(X,Y, np.reshape(fwr_y,X.shape).T,10)
 plt.scatter(X,Y, c=np.reshape(fwr_y,X.shape).T, s=20)
 ax.set_title('Sphere Ana By')
 
-ax = plt.subplot(133)
+ax = plt.subplot(212)
 plt.imshow(np.reshape(fwr_z,X.shape).T, interpolation="bicubic", extent=[xr.min(), xr.max(), yr.min(), yr.max()], origin = 'lower')
-plt.colorbar()
+plt.colorbar(fraction=0.04)
 plt.contour(X,Y, np.reshape(fwr_z,X.shape).T,10)
 plt.scatter(X,Y, c=np.reshape(fwr_z,X.shape).T, s=20)
 ax.set_title('Sphere Ana Bz')
@@ -145,23 +147,23 @@ ax.set_title('Sphere Ana Bz')
 
 #%% Plot foward data
 plt.figure(3)
-ax = plt.subplot(131)
+ax = plt.subplot(221)
 plt.imshow(np.reshape(r_Bx,X.shape).T, interpolation="bicubic", extent=[xr.min(), xr.max(), yr.min(), yr.max()], origin = 'lower')
-plt.colorbar()
+plt.colorbar(fraction=0.04)
 plt.contour(X,Y, np.reshape(r_Bx,X.shape).T,10)
 plt.scatter(X,Y, c=np.reshape(r_Bx,X.shape).T, s=20)
 ax.set_title('Sphere Ana Bx')
 
-ax = plt.subplot(132)
+ax = plt.subplot(222)
 plt.imshow(np.reshape(r_By,X.shape).T, interpolation="bicubic", extent=[xr.min(), xr.max(), yr.min(), yr.max()], origin = 'lower')
-plt.colorbar()
+plt.colorbar(fraction=0.04)
 plt.contour(X,Y, np.reshape(r_By,X.shape).T,10)
 plt.scatter(X,Y, c=np.reshape(r_By,X.shape).T, s=20)
 ax.set_title('Sphere Ana By')
 
-ax = plt.subplot(133)
+ax = plt.subplot(212)
 plt.imshow(np.reshape(r_Bz,X.shape).T, interpolation="bicubic", extent=[xr.min(), xr.max(), yr.min(), yr.max()], origin = 'lower')
-plt.colorbar()
+plt.colorbar(fraction=0.04)
 plt.contour(X,Y, np.reshape(r_Bz,X.shape).T,10)
 plt.scatter(X,Y, c=np.reshape(r_Bz,X.shape).T, s=20)
 ax.set_title('Sphere Ana Bz')

simpegPF/Dev/Intgrl_MAG_Inv_Driver.py

@@ -0,0 +1,37 @@
+import os
+
+home_dir = 'C:\Users\dominiquef.MIRAGEOSCIENCE\Documents\GIT\SimPEG\simpegpf\simpegPF\Dev'
+
+inpfile = 'MAG3Cinv.inp'
+
+os.chdir(home_dir)
+
+#%%
+from SimPEG import np, Utils
+import simpegPF as PF
+
+## New scripts to be added to basecode
+#from fwr_MAG_data import fwr_MAG_data
+#from read_MAGfwr_inp import read_MAGfwr_inp
+
+#%%
+# Read input file
+[mshfile, obsfile, modfile, magfile, topofile] = PF.BaseMag.read_MAGfwr_inp(inpfile)
+
+# Load mesh file
+mesh = Utils.meshutils.readUBCTensorMesh(mshfile)
+
+# Load model file
+model = Utils.meshutils.readUBCTensorModel(modfile,mesh)
+    
+# Load in observation file
+[B,M,dobs] = PF.BaseMag.readUBCmagObs(obsfile)
+
+rxLoc = dobs[:,0:3]
+ndata = rxLoc.shape[0]
+
+# Create forward operator
+F = PF.Magnetics.Intrgl_Fwr_Op(mesh,B,M,rxLoc,'tmi')
+
+
+