Fix merge conflicts and add read GOCAD triangulated surface file

simpegPF/Dev/Intgrl_MAG_Fwr_Driver.py

@@ -46,6 +46,9 @@ rxLoc = dobs[:,0:3]
 #rxLoc[:,2] += 5 # Temporary change for test
 ndata = rxLoc.shape[0]
 
+# Load GOCAD surf
+tsfile = 'SphereA.ts'
+vrtx = PF.BaseMag.read_GOCAD_ts(tsfile)
 #%% Run forward modeling
 # Compute forward model using integral equation
 d = PF.Magnetics.Intgrl_Fwr_Data(mesh,B,M,rxLoc,model,actv,'tmi')