Commit Graph

1605 Commits

Author SHA1 Message Date
seogi_macbook ea0eaf0b6d trial for secondary data 2016-02-09 10:34:23 -08:00
seogi_macbook e9562b3d83 Fix bug, for circularloop 2016-02-05 12:46:13 -08:00
seogi_macbook 94798c76a7 add getMeS for VMD source 2016-02-04 13:47:02 -08:00
seogi_macbook 187dc58323 Merge branch 'Dom_Dev' of https://github.com/simpeg/simpeg into feat/GlobalProblem
Conflicts:
	SimPEG/Problem.py
2016-02-04 12:11:38 -08:00
seogi_macbook b18b99c78f Merge branch 'master' of https://github.com/simpeg/simpeg into feat/GlobalProblem 2016-02-04 11:15:39 -08:00
seogi_macbook a15cbade40 minor change 2016-02-04 11:15:17 -08:00
Lindsey 7c2d803dfe Merge pull request #225 from simpeg/patch/docsbadges
make travis badge look at master for docs
2016-02-02 09:54:43 -08:00
Lindsey Heagy 2adc7d4eb9 make travis badge look at master for docs 2016-02-01 22:31:12 -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
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
seogi_macbook b9d66b1a90 Merge branch 'feat/GlobalProblem' of https://github.com/simpeg/simpeg into feat/GlobalProblem 2016-01-29 07:38:50 -08:00
seogi_macbook d63c549589 minor change 2016-01-29 07:38:23 -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
Rowan Cockett 5dab7ac1a8 Merge pull request #216 from simpeg/bug/215
Closes #215
2016-01-28 23:32:54 -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 604cf83688 Minor updates to the projection mappings. 2016-01-28 23:06:27 -08:00
seogi_macbook da134c5c09 Merge branch 'dev' of https://github.com/simpeg/simpeg into feat/GlobalProblem 2016-01-28 22:39:01 -08:00
Rowan Cockett 0704c6dc25 Merge pull request #213 from simpeg/feat/treeMeshCounting
Tree Mesh Updates
2016-01-28 22:36:48 -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
seogi_macbook 89928369ea Merge branch 'feat/GlobalProblem' of https://github.com/simpeg/simpeg into feat/GlobalProblem
Conflicts:
	SimPEG/Problem.py
2016-01-28 18:54:43 -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
seogi_macbook e3a22a713f minor updates 2016-01-28 16:36:24 -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
Rowan Cockett 09161ff68e Hopefully get a better error message on travis. 2016-01-28 13:58:32 -08:00
Rowan Cockett 97cec29612 Merge branch 'feat/GlobalProblem' of https://github.com/simpeg/simpeg into feat/GlobalProblem 2016-01-28 13:52:16 -08:00
Rowan Cockett d7be0ada31 Update README.rst
Fix the branch that SimPEG travis is pointing
2016-01-28 12:52:21 -08:00
Rowan Cockett e8a6a028c2 Merge pull request #208 from simpeg/docs
move examples right after getting started with SimPEG
2016-01-28 11:36:50 -08:00
Lindsey 06c82ba16d Merge pull request #209 from simpeg/examples
pass loc as a variable in mag dipole example
2016-01-27 09:03:25 -08:00
Lindsey Heagy a8539cc234 pass loc as a variable 2016-01-27 08:41:28 -08:00
Lindsey Heagy 814bd00346 move examples right after getting started with SimPEG 2016-01-26 22:47:11 -08:00
seogi_macbook 2aa2490f64 Mesh2MeshTOPO:
Deals with global to local mesh
2016-01-26 18:53:10 -08:00
seogi_macbook 5e4b4963b4 Merge branch 'master' of https://github.com/simpeg/simpeg into feat/GlobalProblem 2016-01-25 15:20:00 -08:00
seogi_macbook d363a125b6 Merge branch 'master' of https://github.com/simpeg/simpeg 2016-01-25 15:17:34 -08:00
Lindsey 37ec0835c2 Merge pull request #206 from simpeg/examples
Mag Dipole Analytic Wholespace Example
2016-01-23 17:54:30 -08:00
Rowan Cockett 84400650fa Clean up init file in examples. 2016-01-23 16:37:11 -07:00
D Fournier 6fcd826673 Start branch for regularization
Add LinearSurvey
Add LinearProblem
2016-01-20 14:23:42 -08:00
Rowan Cockett 91e37c5fa7 Clean up init code, put inside run, remove mpl from TL import. 2016-01-20 12:52:51 -07:00
Rowan Cockett d7a0c29d3a SubMap as well as SubModel 2016-01-20 12:49:05 -07:00
Lindsey Heagy 98f209d1f0 specify that example is FDEM 2016-01-20 08:04:01 -08:00
Lindsey Heagy 7107cd9d94 plot a harmonic mag dipole 2016-01-19 23:57:41 -08:00
Lindsey e254c04297 Merge pull request #205 from simpeg/example-typo-patch-1
Update and rename EM_FDEM_1D_Inversion.py to EM_TDEM_1D_Inversion.py
2016-01-19 21:12:47 -08:00