2201 Commits

Author SHA1 Message Date
GudniRos 2fcdabf3d5 Fixed directive to save iteration dictionary. 2016-06-09 12:39:25 -07:00
GudniRos b965c96242 Updating examples by running python __init__.py 2016-06-07 13:48:29 -07:00
GudniRos f06ba238f8 Fixing Examples/__init__.py after merge conflict 2016-06-07 13:14:36 -07:00
GudniRos 11408a3788 Fixing an FDEM import to be more explicit 2016-06-07 11:52:29 -07:00
GudniRos 358e2f96af Pull request #328 on github.
Fixing MT namespace to NSEM.
2016-06-07 10:54:16 -07:00
GudniRos cf5181016f Made MT_1d_analytic_nLayer_Earth.run have default n layers of 3.
Trying to fix example testing.
2016-06-07 09:45:02 -07:00
GudniRos d1f7d0c37a Adding ipywidgets to the conda install list for travis 2016-06-01 21:54:19 -07:00
GudniRos 50c4a6caf8 Refactor and updated tests 2016-06-01 20:53:12 -07:00
GudniRos b3029b697b Adjust settings for the MT1D inversion example 2016-06-01 12:00:52 -07:00
GudniRos 8d4581e92f Cleaned MT_1D inverison example 2016-06-01 11:55:12 -07:00
Gudni Karl Rosenkjaer 0a44796d4c Merge pull request #329 from simpeg/em/dev
Em/dev into mt/dev
2016-06-01 11:17:19 -07:00
GudniRos 8117ee3b06 Fixing MT_1D example, runs but inversion results should be better. 2016-06-01 10:22:18 -07:00
GudniRos fb7f5a53d4 Working on examples 2016-06-01 01:05:21 -07:00
GudniRos f34314bba2 Fixed tests and Jvec 2016-05-31 22:33:57 -07:00
GudniRos 7087632701 Fixing name space, updating utils 2016-05-31 22:06:47 -07:00
Lindsey 382b31bd12 Merge pull request #310 from simpeg/ref/regularization
modularizing regularization
2016-05-31 14:09:54 -07:00
Lindsey 6cc509020a Merge pull request #323 from simpeg/feat/plotImage-curvilinear
plotImage for curvilinear mesh
2016-05-30 08:27:56 -07:00
Lindsey Heagy f2e13182bf Merge branch 'dev' into feat/plotImage-curvilinear
# Conflicts:
#	SimPEG/Examples/__init__.py
2016-05-29 16:43:40 -07:00
D Fournier 09cd9c7fa3 Merge branch 'dev' into ref/regularization 2016-05-29 16:26:58 -07:00
Lindsey Heagy 62eb4541cb update example name --> based on mesh 2016-05-29 15:48:15 -07:00
Lindsey 09eb2106ec Merge pull request #307 from simpeg/ref/dev
Ref/dev
2016-05-29 14:50:43 -07:00
D Fournier f8b86abd5a Merge branch 'ref/dev' into ref/regularization 2016-05-29 14:10:46 -07:00
D Fournier e476bf0059 Cleanup Sparse Reg and Directives 2016-05-29 14:09:29 -07:00
Rowan Cockett 825511e9d3 Add a curvilinear plotImage function, update example. 2016-05-29 13:17:22 -07:00
D Fournier 3b4bec9c0b Refactor IRLS iterations, full solves from l2->lp
Adapt Example
2016-05-28 11:27:09 -07:00
D Fournier 022e1f7660 Update IRLS directive to allow multiple GN iterations.
Remove modifications to the ProjGN solver.
Update IRLS example.
2016-05-27 13:11:31 -07:00
D Fournier 406703f1c6 Merge branch 'dev' into ref/dev
Conflicts:
	docs/examples/DC_Forward_PseudoSection.rst
2016-05-27 11:10:39 -07:00
D Fournier 7b72d3a92d Merge branch 'dev' into ref/dev
Conflicts:
	SimPEG/DCIP/DCIPUtils.py
2016-05-27 10:01:28 -07:00
Lindsey cf89f5f6a2 Merge pull request #322 from simpeg/bug/propmap
Bug/propmap
2016-05-26 20:52:42 -07:00
Lindsey Heagy aa1086eba3 use fixed prop map in EM 2016-05-26 18:03:09 -07:00
Lindsey Heagy 1c53129da6 fix bug in prop map linked derivs 2016-05-26 17:58:30 -07:00
sgkang 6fd3be77de Merge pull request #304 from simpeg/dcip/dev
Dcip/dev
2016-05-26 13:27:44 -07:00
seogi_macbook 51d82eee26 Minor fixes to be merged to dev 2016-05-26 09:32:19 -07:00
seogi_macbook f6b49c680a Merge branch 'dev' of https://github.com/simpeg/simpeg into dcip/dev
Conflicts:
	SimPEG/EM/Base.py
	SimPEG/EM/FDEM/SurveyFDEM.py
2016-05-26 09:25:43 -07:00
seogi_macbook 339543b893 Incorporate Lindsey's comments on documenting codes 2016-05-25 23:28:58 -07:00
seogi_macbook 44ad57e90d Merge branch 'dcip/spectralIP' of https://github.com/simpeg/simpeg into dcip/dev
Merge spectral IP stuff, and incorporate Lindsey's comments
2016-05-25 14:22:58 -07:00
Lindsey d98eef2560 Merge pull request #313 from simpeg/em/dev
Em/dev: Naming conventions
2016-05-25 10:53:43 -07:00
seogi_macbook 21d817d9a2 fix bug for adjoint problem 2016-05-24 21:53:18 -07:00
seogi_macbook f20fcb4504 Minor type error based upon numpy version
Cross gradient?
2016-05-24 08:45:12 -07:00
Lindsey Heagy 2c87a50d29 add kwargs to raw vec e,m 2016-05-23 12:21:29 -07:00
Lindsey Heagy beca0203df typo fix 2016-05-23 12:11:03 -07:00
Lindsey Heagy e25b496ab0 allow kwarg input of primary fields 2016-05-23 12:07:14 -07:00
Lindsey e5ec512517 Merge pull request #319 from simpeg/targetmisfit
Target Misfit
2016-05-22 12:36:21 -07:00
Lindsey 342414bd25 Merge pull request #302 from simpeg/fix/numpyDependency
Installation (i.e., setup.py) is no longer dependent on Numpy
2016-05-22 12:03:37 -07:00
Lindsey Heagy 8936fa4021 use phi_d_star, chifact in defining target misfit 2016-05-22 11:42:23 -07:00
seogi_macbook 0179631fe3 Starting Cross gradient ... 2016-05-20 01:57:40 -07:00
seogi_macbook c4c97ae054 Ad MultiRegularization for inverting multiple parameters 2016-05-20 00:04:20 -07:00
seogi_macbook e8bd78f63d Working Spectral IP:
- Fwd
	- Jvec
	- Jtvec
2016-05-19 02:09:48 +09:00
Lindsey d0a65dda1b Merge pull request #317 from simpeg/em/ref/dev-cleanup
em/dev cleanup
2016-05-18 08:13:06 -07:00
Lindsey Heagy a506d5c6be Merge branch 'em/dev' into em/ref/dev-cleanup 2016-05-18 07:31:15 -07:00