Commit Graph

2283 Commits

Author SHA1 Message Date
Lindsey Heagy 999a37547e Merge branch 'dev' into docs
# Conflicts:
#	.travis.yml
#	SimPEG/EM/FDEM/FDEM.py
#	SimPEG/Mesh/TensorMesh.py
2016-02-09 08:32:41 -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
Lindsey 994cba529b Merge pull request #227 from simpeg/dev
Dev
2016-02-05 17:55:13 -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 73edef5eb7 the forward for all fields and fluxes can be computed from any formulation (todo: derive) 2016-02-04 19:34:16 -08:00
Lindsey Heagy 8a7e72f3e8 Merge branch 'em/dev' into em/rx
# Conflicts:
#	SimPEG/EM/FDEM/FDEM.py
#	SimPEG/Mesh/TensorMesh.py
2016-02-04 19:01:43 -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
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 Heagy 5b78d69c6d use set diff for testing if all examples have been included 2016-02-04 09:11:23 -08:00
GudniRos b8bd011662 Added a 3D forward example. Missing plots. 2016-02-04 02:28:22 -08:00
GudniRos 345e39ed43 Updated doc strings, moved functions around and cleaned unused text. 2016-02-04 00:23:07 -08:00
Lindsey Heagy b81b5af461 use abspath for travis 2016-02-03 20:23:31 -08:00
Lindsey Heagy 433457f649 docs and import for DC_PseudoSection_Simulation.rst 2016-02-03 20:12:55 -08:00
D Fournier 3eeb5dbd3c Remove dependency from Utils. Replace by internal function. 2016-02-03 20:03:05 -08:00
Lindsey Heagy 32c936c4e3 add test to ensure examples are up to date 2016-02-03 19:55:42 -08:00
D Fournier df78f7b33a Branch off master
Add DC_Pseudo_Section example.
2016-02-03 14:35:03 -08:00
GudniRos 01bf46c8bf Updated example 2016-02-03 14:21:41 -08:00
GudniRos 664589f856 Example for 1D forward and inversion of MT 2016-02-03 14:21:11 -08:00
Lindsey 05ce38013e Merge pull request #223 from simpeg/em/dev
Em/dev
2016-02-02 14:35:22 -08:00