Commit Graph

52 Commits

Author SHA1 Message Date
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 Heagy 3f2396ad33 use f to denote fields in the project fields and project fields deriv 2016-02-14 15:10:27 -08:00
GudniRos 97336129de Checkout a updated file from Seogi. 2016-02-08 22:25:42 -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 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 a80eac7dc3 documentation for FDEM.py 2016-02-06 15:05:15 -08:00
Lindsey Heagy 92b5435149 Merge branch 'dev' into em/dev 2016-02-01 22:12:22 -08:00
Lindsey Heagy 1457e51fc1 from SimPEG.EM import mu_0 2016-01-28 23:44:02 -08:00
Lindsey Heagy 967dc83fa8 fixed merge conflict with em/dev 2016-01-28 23:14:03 -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
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
Lindsey Heagy 8da4d78bde Merge branch 'master' into em/dev 2016-01-15 10:53:22 -08:00
Rowan Cockett 28b8a69d7b Merge pull request #203 from simpeg/em/dev
Em/dev
2016-01-14 21:21:07 -08:00
Lindsey Heagy 1700f4f9c0 add Ainv.clean() to fdem fields, jvec, jtvec 2016-01-14 14:00:55 -08:00
seogi_macbook 32f3ef301a Modifications for general waveform 2016-01-12 18:52:39 -08:00
Rowan Cockett 2c5b19b7a0 Updates to the documentation. 2016-01-10 17:21:01 -08:00
Rowan Cockett 985d5b6469 Bump version: 0.1.7 → 0.1.8 (+7 squashed commits)
Squashed commits:
[ac5bb36] Bump version: 0.1.8 → 0.1.9
[8acd6b2] ImportException --> ImportError
[ac410a8] matplotlib.pyplot has errors on import, put these in the functions
that rely on them directly.
[f128a20] Bump version: 0.1.6 → 0.1.7
[5866bea] Remove IPython utils.

These are out of date, and have problems on Linux (without a proper
visual backend).
[a519e56] Bump version: 0.1.5 → 0.1.6
[f45aa83] Bump version: 0.1.4 → 0.1.5
2016-01-10 13:38:06 -08:00
Rowan Cockett 6747882e52 Merge pull request #192 from simpeg/feat/examples
SimPEG examples
2016-01-03 14:02:38 -08:00
Rowan Cockett be3667b4ab New Examples
- Put all examples in same directory
   - Make a single test
   - use __init__.py to create the docs automatically
2015-11-25 16:03:08 -08:00
Lindsey 37f56f25f3 cleaned out Zero, Identity import from FDEM.py 2015-11-24 16:15:57 -08:00
Lindsey Heagy 71a5c8b2c1 fix sizes in Fields object (make an array not a vector) 2015-11-24 11:01:51 -08:00
Lindsey Heagy 9b847c0e32 replaced all numpy (a += b) with (a = a + b) because it plays more nicely with the Zero class 2015-11-24 10:06:15 -08:00
Lindsey 815311bfec cleaned up sources 2015-11-23 18:03:49 -08:00
Lindsey 6a83af7334 merged master to get namespace changes, resolved merge conflicts, use zero, identity for derivs, defaults for primary fields and sources 2015-11-23 17:41:32 -08:00
Lindsey Heagy 622152c0c8 import simpegEM utils 2015-11-17 22:33:59 -08:00
Lindsey Heagy 699f6452b2 cleaned up imports for source 2015-11-17 22:29:44 -08:00
Lindsey Heagy 7023e999bc SurveyFDEM --> Survey, FieldsFDEM --> Fields 2015-11-17 22:17:38 -08:00
Lindsey Heagy 2fbe0af108 BaseSrcFDEM --> BaseSrc 2015-11-17 21:47:38 -08:00
Lindsey Heagy c041ad3de6 EM.FDEM.RxFDEM --> EM.FDEM.Rx 2015-11-17 08:29:27 -08:00
Lindsey Heagy 2da82b7d19 fixed SrcUtils call in SurveyTDEM 2015-11-13 12:24:12 -08:00
Lindsey Heagy 356a5b103d and in SurveyTDEM 2015-11-13 12:20:07 -08:00
Lindsey Heagy aed5f5ad52 fixed SrcUtils import in BaseTDEM 2015-11-13 12:15:32 -08:00
Lindsey Heagy 19bcdbfbf5 EM.FDEM.SrcFDEM_XXX --> EM.FDEM.Src.XXX 2015-11-13 10:39:08 -08:00
Lindsey Heagy 3b62957d08 re-named SrcUtils to AnalyticUtils, cleaned up namespace for imports to close #159 2015-11-13 08:44:34 -08:00
Lindsey Heagy 25e21608df import all EM utils under Utils namespace 2015-11-13 08:34:46 -08:00
Lindsey Heagy 6b413c8b43 Merge branch 'master' into em/ZeroIdentity 2015-11-09 09:24:54 -08:00
Lindsey Heagy 554f507ba7 switch order of addition to satisfy Zero class 2015-11-09 09:15:02 -08:00
Lindsey Heagy 915a2f8446 cleaned out commented-out code 2015-11-08 15:18:19 -08:00
Lindsey Heagy 297ea916b4 light notation clean up 2015-11-08 14:58:28 -08:00
Lindsey Heagy 639a6e7a06 Adjoint for all 4 formulations with Zero Identity 2015-11-08 14:09:18 -08:00
Lindsey Heagy 0af1f59891 h,j jvec now with Zero and identity classes 2015-11-06 10:58:23 -08:00
Lindsey Heagy 4553d6db51 b formulation Zero Identity 2015-11-06 10:05:44 -08:00
Lindsey Heagy d102ec9c00 Zero, Identity for E formulation 2015-11-06 10:00:30 -08:00
Lindsey Heagy 41970a221a split up adjoint and deriv test, pulled out getProblem call and put it in utils 2015-11-05 15:44:35 -08:00