Commit Graph

1608 Commits

Author SHA1 Message Date
Rowan Cockett 4776544b30 Initial work on defaults. 2016-02-15 10:51:43 -08:00
Lindsey 463b9b6164 Merge pull request #240 from simpeg/em/dev
Em/dev
2016-02-09 08:04:45 -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 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
Lindsey Heagy 2fb8de708a use Zero in sdiag instead of returing h to avoid confusion 2016-02-04 18:49:42 -08:00
Lindsey Heagy 5b78d69c6d use set diff for testing if all examples have been included 2016-02-04 09:11:23 -08:00
Lindsey Heagy b81b5af461 use abspath for travis 2016-02-03 20:23:31 -08:00
Lindsey Heagy 32c936c4e3 add test to ensure examples are up to date 2016-02-03 19:55:42 -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
Lindsey 28a8a2ea80 Merge pull request #217 from simpeg/em/inversioncleanup
Em/inversioncleanup
2016-02-01 19:23:39 -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
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
Lindsey Heagy 4bcc9e0850 - name cleanup in Jvec and Jtvec (use u instead of f to be consistent with the rest of SimPEG)
- example 1D inversion for FDEM
2016-01-28 14:00:47 -08:00
Rowan Cockett 09161ff68e Hopefully get a better error message on travis. 2016-01-28 13:58:32 -08:00
Lindsey Heagy c24416ea12 use the std and eps from survey in definition of data misfit if defined (and demonstrate it with the TDEM example) 2016-01-28 13:20:48 -08:00
Lindsey Heagy f5333f35a2 use survey.createSyntheticData to make synthetic data 2016-01-28 13:07:48 -08:00
Lindsey Heagy d50232b385 give Zero a transpose 2016-01-28 13:04:13 -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 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
Rowan Cockett 91e37c5fa7 Clean up init code, put inside run, remove mpl from TL import. 2016-01-20 12:52:51 -07:00