Commit Graph

1337 Commits

Author SHA1 Message Date
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
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
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
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 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
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
GudniRos 7e45390611 Fixing a bug in Data class 2016-01-27 02:16:43 -08:00
GudniRos e276ca70d6 Added directive to save dpred after every iteration. 2016-01-27 01:01:50 -08:00
GudniRos 096a72fdb4 Tipper derivatives and adjoint working. 2016-01-26 12:07:42 -08:00
GudniRos 78d710de57 Implemented tipper projection derivatives 2016-01-25 22:50:15 -08:00
GudniRos bd488a4f0b Removed rxPair from the source, which was causing a bug. 2016-01-25 22:23:29 -08:00
seogi_macbook d363a125b6 Merge branch 'master' of https://github.com/simpeg/simpeg 2016-01-25 15:17:34 -08:00
GudniRos f3bf17ebe5 Work on MT, fixing bugs 2016-01-25 12:29:03 -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
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 Heagy bb3f9a6a87 make projGLoc a method not a property 2016-01-17 14:54:02 -08:00
Lindsey Heagy fac3f63fba Merge branch 'em/dev' into em/rx 2016-01-15 10:56:14 -08:00
Lindsey Heagy 8da4d78bde Merge branch 'master' into em/dev 2016-01-15 10:53:22 -08:00
Lindsey Heagy 0b971f4a50 updated examples init to also update docs 2016-01-15 10:46:31 -08:00
Lindsey 7a4aa4ddc3 Update and rename EM_FDEM_1D_Inversion.py to EM_TDEM_1D_Inversion.py
- this is a TDEM inversion (not FDEM)
2016-01-15 10:07:11 -08:00
Rowan Cockett 28b8a69d7b Merge pull request #203 from simpeg/em/dev
Em/dev
2016-01-14 21:21:07 -08:00
Rowan Cockett 558e8879fe SimPEG.MT Mergify.
Merge branch 'move2Simpeg' of https://github.com/simpeg/simpegmt into mt/dev

Conflicts:
	.gitignore
	.travis.yml
	LICENSE
	docs/conf.py
	docs/index.rst
	requirements.txt
	setup.py
2016-01-14 15:36:58 -08:00
Rowan Cockett e15913cf84 Import all code utils into the utils namespace. 2016-01-14 15:12:34 -08:00
Rowan Cockett 01b1122fcf Add default interpolation location (CC). 2016-01-14 15:12:09 -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 cdf0ebf8d0 Merge pull request #197 from simpeg/dev
Dev
2016-01-10 18:47:52 -08:00
Rowan Cockett dedabcc15f Allow solver kwargs to go to the class directly. 2016-01-10 18:36:57 -08:00
Rowan Cockett 2c5b19b7a0 Updates to the documentation. 2016-01-10 17:21:01 -08:00
Rowan Cockett 1ba96ba8d0 Merge pull request #194 from simpeg/dev
Example, Pip, Zero, Identity, Faster Builds
2016-01-10 14:02: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 d93a23306c Bump version: 0.1.3 → 0.1.4 2016-01-10 12:47:43 -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 d64fd4ae35 List examples in the init file. 2016-01-02 18:29:04 -08:00
Rowan Cockett f0f3f6c06a Update the examples init.py to explicitly reference things.
You can run the main function to update the docs and imports.
2016-01-02 18:06:49 -08:00
GudniRos 79f7ca7a1e Adden dpred to be written in the saveDict directive 2015-12-15 19:35:18 -08:00
GudniRos 84eb69f626 UBC ocTree read and write working. 2015-12-14 01:46:01 -08:00
GudniRos 69d109524e Working on reordering of UBC models. 2015-12-12 13:52:26 -08:00
Lindsey Heagy 22a6310a59 breaking up tests, also pass in u to df_dm 2015-12-10 08:51:06 -08:00
GudniRos ba2ac74740 Fixed code error 2015-12-09 15:53:41 -08:00