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

Merge pull request #8 from simpeg/IP

Browse Source 
IP branch
This commit is contained in:
sgkang
2016-02-04 11:37:10 -08:00
parent 7f14c32124 1f1522da01
commit d49a16d7e9
9 changed files with 549 additions and 1319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+10 -3
View File
@@ -18,10 +18,16 @@ install:
- conda install --yes pip python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib cython
- pip install nose-cov python-coveralls
# Remove this when SimPEG is on pip
- git clone https://github.com/simpeg/simpeg.git
- cd simpeg/
- git clone https://github.com/rowanc1/pymatsolver.git
- cd pymatsolver; python setup.py install; cd ..
- python setup.py install
- cd ../
- python setup.py build_ext --inplace
# - git clone https://github.com/simpeg/simpeg.git
# - cd simpeg/
# - python setup.py install
# - cd ../
# Run test
script:
@@ -34,3 +40,4 @@ after_success:
notifications:
email:
- rowanc1@gmail.com
- sgkang09@gmail.com
notebooks/2DinvDC.ipynb
+58 -60
View File
File diff suppressed because one or more lines are too long
notebooks/CircModel.ipynb
+39 -35
View File
File diff suppressed because one or more lines are too long
notebooks/CircModel-Copy1.ipynb → notebooks/CircModel_app.ipynb
+12
View File
@@ -395,6 +395,18 @@
"display_name": "Python 2",
"language": "python",
"name": "python2"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 2
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython2",
"version": "2.7.11"
}
},
"nbformat": 4,
notebooks/DCR Pseudo-section Simulation.ipynb
+12 -15
View File
File diff suppressed because one or more lines are too long
notebooks/DC_Forward_Live.ipynb
+19 -27
View File
File diff suppressed because one or more lines are too long
notebooks/DCinverse.ipynb
+399 -443
View File
File diff suppressed because one or more lines are too long
notebooks/SimPEG Tutorial - DC Fwr Problem.ipynb
-441
View File
File diff suppressed because one or more lines are too long
notebooks/ThreeMeshDC.ipynb
-295
View File
@@ -1,295 +0,0 @@
{
"metadata": {
"name": "",
"signature": "sha256:189621fc59a92a7c23842dcbc46e2decfeef63b14613f47a605c97b622f48fc0"
},
"nbformat": 3,
"nbformat_minor": 0,
"worksheets": [
{
"cells": [
{
"cell_type": "code",
"collapsed": false,
"input": [
"from SimPEG import Mesh, Utils, np, SolverLU\n",
"import matplotlib.pyplot as plt\n",
"# %pylab inline"
],
"language": "python",
"metadata": {},
"outputs": [
{
"output_type": "stream",
"stream": "stderr",
"text": [
"Vendor: Continuum Analytics, Inc.\n",
"Package: mkl\n",
"Message: trial mode expires in 20 days\n"
]
}
],
"prompt_number": 1
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"import matplotlib\n",
"from matplotlib.mlab import griddata"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 2
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"matplotlib.rcParams.update({'font.size': 16, 'text.usetex': True})"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 3
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"sz = [15,15]\n",
"tM = Mesh.TensorMesh(sz)\n",
"qM = Mesh.TreeMesh(sz)\n",
"qM.refine(lambda X: 1 if np.sqrt(((X-0.5)**2).sum()) < 0.45 else 0)\n",
"rM = Mesh.CurvilinearMesh(Utils.meshutils.exampleLrmGrid(sz,'rotate'))"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 5
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"fun = lambda X: 1 if np.sqrt(((X-0.5)**2).sum()) < 0.45 else 0"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 6
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"fun(np.ones(30))"
],
"language": "python",
"metadata": {},
"outputs": [
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 7,
"text": [
"0"
]
}
],
"prompt_number": 7
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"def DCfun(mesh, pts):\n",
" D = mesh.faceDiv\n",
" G = D.T\n",
" sigma = 1e-2*np.ones(mesh.nC)\n",
" Msigi = mesh.getFaceInnerProduct(1./sigma)\n",
" MsigI = Utils.sdInv(Msigi)\n",
" A = D*MsigI*G\n",
" A[-1,-1] /= mesh.vol[-1] # Remove null space\n",
" rhs = np.zeros(mesh.nC)\n",
" txind = Utils.meshutils.closestPoints(mesh, pts)\n",
" rhs[txind] = np.r_[1,-1]\n",
" return A, rhs"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 8
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"tM.vectorCCy"
],
"language": "python",
"metadata": {},
"outputs": [
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 9,
"text": [
"array([ 0.03333333, 0.1 , 0.16666667, 0.23333333, 0.3 ,\n",
" 0.36666667, 0.43333333, 0.5 , 0.56666667, 0.63333333,\n",
" 0.7 , 0.76666667, 0.83333333, 0.9 , 0.96666667])"
]
}
],
"prompt_number": 9
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"pts = np.vstack((np.r_[0.25, 0.5], np.r_[0.75, 0.5]))"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 10
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"AtM, rhstM = DCfun(tM, pts)\n",
"AinvtM = SolverLU(AtM)\n",
"phitM = AinvtM*rhstM"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 11
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"AqM, rhsqM = DCfun(qM, pts)\n",
"AinvqM = SolverLU(AqM)\n",
"phiqM = AinvqM*rhsqM"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 12
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"ArM, rhsrM = DCfun(rM, pts)\n",
"AinvrM = SolverLU(ArM)\n",
"phirM = AinvrM*rhsrM"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 13
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"coreind = (qM.gridCC[:,0]-0.5)**2+(qM.gridCC[:,1]-0.5)**2 >0.43**2\n",
"phiqM[coreind] = 0."
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 14
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"Xi = tM.gridCC[:,0].reshape(sz[0], sz[1], order='F')\n",
"Yi = tM.gridCC[:,1].reshape(sz[0], sz[1], order='F')\n",
"PHItM = griddata(tM.gridCC[:,0], tM.gridCC[:,1], phitM, Xi, Yi, interp='linear')\n",
"PHIqM = griddata(qM.gridCC[:,0], qM.gridCC[:,1], phiqM, Xi, Yi, interp='linear')\n",
"PHIrM = griddata(rM.gridCC[:,0], rM.gridCC[:,1], phirM, Xi, Yi, interp='linear')"
],
"language": "python",
"metadata": {},
"outputs": [
{
"output_type": "stream",
"stream": "stderr",
"text": [
"/Users/sgkang/anaconda/lib/python2.7/site-packages/matplotlib/tri/triangulation.py:110: FutureWarning: comparison to `None` will result in an elementwise object comparison in the future.\n",
" self._neighbors)\n"
]
}
],
"prompt_number": 15
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"fig, axes = plt.subplots(1,3,figsize=(14*1.2,4*1.2))\n",
"label = [\"(a)\", \"(b)\", \"(c)\"]\n",
"opts = {}\n",
"vmin, vmax = PHItM.min(), PHItM.max()\n",
"dat = axes[0].contourf(Xi, Yi, PHItM, 100)\n",
"tM.plotGrid(ax=axes[0], **opts)\n",
"axes[0].set_title('TensorMesh')\n",
"axes[1].contourf(Xi, Yi, PHIqM, 100)\n",
"qM.plotGrid(ax=axes[1], **opts)\n",
"axes[1].set_title('TreeMesh')\n",
"axes[2].contourf(Xi, Yi, PHIrM, 100)\n",
"rM.plotGrid(ax=axes[2], **opts)\n",
"axes[2].set_title('CurvilinearMesh')\n",
"for i in range(3):\n",
" axes[i].set_xlim(0.025, 0.975)\n",
" axes[i].set_ylim(0.025, 0.975)\n",
" axes[i].text(0., 1.0, label[i], fontsize=24)\n",
" if i==0: \n",
" axes[i].set_ylabel(\"y\")\n",
" else:\n",
" axes[i].set_ylabel(\" \")\n",
" axes[i].set_xlabel(\"x\")\n",
"plt.show()\n",
"# fig.savefig(\"./ThreeMesh.png\", dpi=100)"
],
"language": "python",
"metadata": {},
"outputs": []
},
{
"cell_type": "code",
"collapsed": false,
"input": [],
"language": "python",
"metadata": {},
"outputs": []
},
{
"cell_type": "code",
"collapsed": false,
"input": [],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 68
},
{
"cell_type": "code",
"collapsed": false,
"input": [],
"language": "python",
"metadata": {},
"outputs": []
}
],
"metadata": {}
}
]
}