Commit Graph

1879 Commits

Author SHA1 Message Date
D Fournier cd352dc5f7 Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev 2016-02-19 16:42:13 -08:00
D Fournier a7c35abd56 Major re-write for the IO and pseudo-section function.
Will need to adapt the example.
2016-02-19 16:41:59 -08:00
Rowan Cockett 16239aa414 Merge branch 'dev' of https://github.com/simpeg/simpeg into dcip/dev
# Conflicts:
#	SimPEG/Examples/__init__.py
2016-02-16 22:14:22 -08:00
Rowan Cockett 9bf4a6228d Remove the update_IRLS and move to PR #254. 2016-02-16 22:06:17 -08:00
Rowan Cockett 226a28f611 Remove regularization and diff op changes, and deal with these in a separate PR #254. 2016-02-16 22:01:50 -08:00
Rowan Cockett 4c547d22c6 Move the optimization code into PR #253. 2016-02-16 21:55:21 -08:00
Rowan Cockett fb1973cfe4 Merge pull request #211 from simpeg/mt/dev
Merge MT into dev
2016-02-16 17:14:49 -08:00
Lindsey Heagy 4067106956 fixed merge conflict in examples __init__.py 2016-02-16 16:14:41 -08:00
Lindsey 980a382613 Merge pull request #252 from simpeg/em/dev
Em/dev
2016-02-16 16:09:07 -08:00
Rowan Cockett e464fc0dfd Reduce number of frequencies in forward problem MT example. 2016-02-16 14:55:17 -08:00
GudniRos 015b940130 Ran Example/__init__.py 2016-02-16 13:26:58 -08:00
Rowan Cockett 6ccfa71dd7 Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev 2016-02-16 13:01:48 -08:00
Rowan Cockett 1d06b768e2 Remove second derivatives in simple regularization 2016-02-16 13:01:32 -08:00
D Fournier cb9e820eb3 Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev 2016-02-16 12:36:22 -08:00
D Fournier d6664155c6 Start changing the IO to use Survey class 2016-02-16 12:35:36 -08:00
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
Lindsey 44359d4306 Merge pull request #245 from simpeg/em/patch-rxprojectfieldsnotation
use f to denote fields in the project fields and project fields deriv
2016-02-14 15:43:46 -08:00
Lindsey Heagy 3f2396ad33 use f to denote fields in the project fields and project fields deriv 2016-02-14 15:10:27 -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
GudniRos 186708f8de Fixed an error with u refactoring 2016-02-10 07:24:49 -08:00
GudniRos c8c034cc2d Changed default input of Jvec for f to u 2016-02-10 07:06:57 -08:00
seogi_macbook 60e18eef01 Working on reading DCIP 3D 2016-02-09 16:11:25 -08:00
Lindsey 463b9b6164 Merge pull request #240 from simpeg/em/dev
Em/dev
2016-02-09 08:04:45 -08:00
GudniRos 97336129de Checkout a updated file from Seogi. 2016-02-08 22:25:42 -08:00
GudniRos cdf7c0edc1 Changed the name string. 2016-02-08 22:22:39 -08:00
Lindsey Heagy 92c83c88d4 Merge branch 'em/dev' of https://github.com/simpeg/simpeg into em/dev 2016-02-08 14:01:14 -08:00
Lindsey Heagy 5da9235eb4 light code cleanup 2016-02-08 12:58:04 -08:00
Lindsey e8712a9f4a Merge pull request #238 from simpeg/em/docs
Em/docs
2016-02-08 09:27:06 -08:00
Lindsey Heagy 00774176f3 cleanup of math 2016-02-08 08:55:02 -08:00
Lindsey Heagy f9359b7f08 a couple typo fixes 2016-02-07 13:07:40 -08:00
Lindsey Heagy 81c13b12e3 cleanup of docs, docs for survey 2016-02-07 13:04:13 -08:00
Lindsey Heagy cb9a70bacc docs for source 2016-02-07 12:53:57 -08:00
Lindsey Heagy e7b69dccfd FDEM Fields object docs 2016-02-07 11:31:00 -08:00
Lindsey Heagy e4fc128383 organizing toctree in EM docs 2016-02-06 15:06:23 -08:00
Lindsey Heagy a80eac7dc3 documentation for FDEM.py 2016-02-06 15:05:15 -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
Lindsey 72a5009d9d Merge pull request #229 from simpeg/test/examples
add test to ensure examples are up to date
2016-02-05 11:13:59 -08:00
Lindsey 5515f7dadd Merge pull request #232 from simpeg/patch/Zero_in_sdiag
use Zero in sdiag instead of returing h to avoid confusion
2016-02-05 09:14:46 -08:00
GudniRos 3de8fb5f15 Fixed a spelling error 2016-02-04 23:53:36 -08:00
GudniRos 5705fabc5a Fixed comments from Lindsey and Rowan 2016-02-04 22:38:19 -08:00
Lindsey Heagy 2fb8de708a use Zero in sdiag instead of returing h to avoid confusion 2016-02-04 18:49:42 -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