Commit Graph

1692 Commits

Author SHA1 Message Date
Rowan Cockett e4c30705ff Clean up whitespace in optimization. 2016-02-16 09:47:07 -08:00
Rowan Cockett 059850f282 Clean examples and remove duplicate. 2016-02-16 09:41:24 -08:00
seogi_macbook c1bd8edf77 return DCdata class? 2016-02-11 15:29:16 -08:00
seogi_macbook d9c94b9793 Move stuff to DCIPUtils.py 2016-02-11 14:10:44 -08:00
seogi_macbook 60e18eef01 Working on reading DCIP 3D 2016-02-09 16:11:25 -08:00
Rowan Cockett 7a6d0c9fdd Updates to SimPEG.DCIP 2016-02-05 15:09:52 -08:00
Rowan Cockett bdfabe620a Add the DC examples 2016-02-05 14:01:56 -08:00
Rowan Cockett 9b67956630 Use the linear problem and survey class 2016-02-05 14:01:20 -08:00
Rowan Cockett ac8f26be3e Update DC example. 2016-02-05 14:00:01 -08:00
Rowan Cockett 2e78e09bd0 Merge branch 'Dom_Dev' of https://github.com/simpeg/simpeg into dcip/dev 2016-02-05 13:51:53 -08:00
Rowan Cockett 8262ee94bc Initial commit of DCIP. 2016-02-04 17:03:42 -08:00
sgkang d49a16d7e9 Merge pull request #8 from simpeg/IP
IP branch
2016-02-04 11:37:10 -08:00
seogi_macbook 1f1522da01 Minor correction for notebooks 2016-02-04 11:36:27 -08:00
seogi_macbook 0ad24f175b Merge branch 'master' of https://github.com/simpeg/simpegdc into IP 2016-02-04 11:24:39 -08:00
sgkang 7f14c32124 Merge pull request #7 from simpeg/Dom/BaseDC
Dom/base dc
2016-02-04 11:22:50 -08:00
seogi_macbook dc6009f9c8 add pymatsolver to travis 2016-02-04 11:12:12 -08:00
D Fournier e2f30ffbb6 Remove unnecessary files for pull request 2016-02-04 11:11:14 -08:00
D Fournier 34acd4876b Merge branch 'master' into Dom_dev 2016-02-04 11:06:53 -08:00
D Fournier ac7ba39732 Add example in preparation for branching off 2016-02-04 11:05:56 -08:00
Rowan Cockett 269269daf7 Merge pull request #6 from simpeg/Dom_dev
Examples and IP
2016-02-04 09:17:40 -08:00
Rowan Cockett 9b65fa80c9 getIndicesBlock typo. 2016-02-04 09:16:14 -08:00
Rowan Cockett 2a84f1556e Merge in @sgkang's work on IP. 2016-02-04 09:16:01 -08:00
Lindsey 05ce38013e Merge pull request #223 from simpeg/em/dev
Em/dev
2016-02-02 14:35:22 -08:00
Lindsey abc464ab46 Merge pull request #224 from simpeg/patch/docsbadges
make travis badge look at master for docs
2016-02-02 08:13:35 -08:00
Lindsey Heagy 2adc7d4eb9 make travis badge look at master for docs 2016-02-01 22:31:12 -08:00
Lindsey Heagy 92b5435149 Merge branch 'dev' into em/dev 2016-02-01 22:12:22 -08:00
D Fournier 78584ae49d Create pseudo-section simulation in Notebook.
Sub-functions added to BaseDC. Required for the simulation
2016-02-01 21:03:58 -08:00
D Fournier b16b1b7526 Add ModelBuilder sphere model.
Add example for DC pseudo section -> Requires a pull request in SimpegDC for dependancies.
2016-02-01 21:02:11 -08:00
Lindsey 28a8a2ea80 Merge pull request #217 from simpeg/em/inversioncleanup
Em/inversioncleanup
2016-02-01 19:23:39 -08:00
D Fournier 04d977f861 Implement and test Directive for sparse norm... need clean up. 2016-01-31 15:31:20 -08:00
D Fournier 254fd1c029 Improved sparse regularization.
Issue with spyder debugger since last merge with dev...
2016-01-31 10:50:06 -08:00
D Fournier 2e3a6ddd96 Merge branch 'dev' into Dom_Dev 2016-01-31 10:33:44 -08:00
D Fournier b4c4841976 Merge 2016-01-29 13:47:13 -08:00
D Fournier 54ec7187cb Add unitCellGrad to DiffOperators
Implement SparseRegularization and test on mag problem... works!
2016-01-29 00:50:59 -08:00
Lindsey Heagy 1457e51fc1 from SimPEG.EM import mu_0 2016-01-28 23:44:02 -08:00
Rowan Cockett 5dab7ac1a8 Merge pull request #216 from simpeg/bug/215
Closes #215
2016-01-28 23:32:54 -08:00
Lindsey Heagy 967dc83fa8 fixed merge conflict with em/dev 2016-01-28 23:14:03 -08:00
Rowan Cockett 3431fb46eb Merge branch 'dev' of https://github.com/simpeg/simpeg into bug/215 2016-01-28 23:07:34 -08:00
Rowan Cockett 0704c6dc25 Merge pull request #213 from simpeg/feat/treeMeshCounting
Tree Mesh Updates
2016-01-28 22:36:48 -08:00
Lindsey Heagy 37d37369d8 added example to docs 2016-01-28 22:36:39 -08:00
Rowan Cockett b013508270 Fixes #215 2016-01-28 22:33:04 -08:00
Rowan Cockett 20d5582c0f Merge branch 'master' of https://github.com/simpeg/simpeg into dev 2016-01-28 22:29:59 -08:00
Rowan Cockett caba2b6752 Merge pull request #191 from simpeg/ActiveCellReg
Meshless Identity Map, Regularization for Active Cell models
2016-01-28 22:28:08 -08:00
D Fournier 02d840a40e Merge branch 'master' into dom_Optimization_Dev 2016-01-28 18:37:23 -08:00
D Fournier 9f5b2e2dc1 Merge branch 'master' into dom_Optimization_Dev 2016-01-28 18:36:46 -08:00
D Fournier 85b55139e8 Implement simple regularization
Modified the Optimization.ProjectedGNCG to allow active cells back in.
Fix problem regarding the Directive.TargetMisfit --> Survey.Linear had wrong nD value
2016-01-28 18:36:34 -08:00
Rowan Cockett 43c49d5f15 Address mesh IO #212 2016-01-28 17:53:10 -08:00
Rowan Cockett 1bcb572c45 Remove ifmain from TreeMesh 2016-01-28 14:29:45 -08:00
Rowan Cockett 67d3cb4d9b Merge branch 'dev' of https://github.com/simpeg/simpeg into feat/treeMeshCounting
Conflicts:
	.travis.yml
	SimPEG/Utils/__init__.py
2016-01-28 14:26:21 -08:00
Rowan Cockett 860bd5638a Add VTK to the travis dependencies.
I am not adding this to the requirements.txt file.
2016-01-28 14:19:29 -08:00