Commit Graph

2159 Commits

Author SHA1 Message Date
Lindsey Heagy 3b5dfecb46 cleanup imports and class instantiation of prim-sec src in sigma 2016-05-30 10:05:15 -07:00
Lindsey Heagy 93d8ef5921 don't need m on the prim-sec src 2016-05-30 09:37:06 -07:00
Lindsey Heagy 5b0a58b751 typo in src input 2016-05-30 09:26:28 -07:00
Lindsey Heagy 9155a9c474 prim sec src in conductivity 2016-05-30 09:10:53 -07:00
Lindsey Heagy 64510bc606 Merge branch 'dev' into maps/feat-parametrizedBlock 2016-05-29 14:51:11 -07:00
Lindsey 09eb2106ec Merge pull request #307 from simpeg/ref/dev
Ref/dev
2016-05-29 14:50:43 -07:00
Lindsey Heagy d9f0241da3 typo fix in nC (it is mesh.nC) 2016-05-29 14:21:08 -07:00
Lindsey Heagy 9a7225c9f6 - bug fix in parametrized block when active cells are used - need a shape
- add a pole receiver for DC
2016-05-29 13:40:21 -07:00
Lindsey Heagy e8e022fcc6 return a scipy sparse matrix for the deriv (a bit silly - it is dense, but nicer for multiplication). Init Regularization with a nP 2016-05-28 15:40:28 -07:00
Lindsey Heagy 341b98d23a use layer center and layer thickness to parametrize layer 2016-05-28 13:06:19 -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 Heagy efbc8f9057 add docs for ParametrizedBlockInLayer, moved docs from rst to python files and automodule the docs for maps 2016-05-26 23:06:57 -07:00
Lindsey Heagy 39ece11d8a Merge branch 'dev' into maps/feat-parametrizedBlock 2016-05-26 21:32:57 -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
Lindsey Heagy c36b5a600d add parametrized block in a layer map 2016-05-26 10:30:10 -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
Lindsey Heagy 10c8791514 update base MT to import ProblemFDEM 2016-05-18 00:33:30 -07:00
Lindsey Heagy c88263234b rename FDEM --> ProblemFDEM 2016-05-17 23:56:06 -07:00
Lindsey Heagy d5219be3d8 Merge branch 'dev' into dcip/dev
# Conflicts:
#	SimPEG/DCIP/DCIPUtils.py
2016-05-17 23:26:17 -07:00
Lindsey Heagy 029171fb1d use .format for strings 2016-05-11 09:09:26 -07:00
Lindsey Heagy a690cab131 simple field receivers are Point receivers 2016-05-11 09:05:13 -07:00
Lindsey Heagy c1b1c2467f import from ProblemFDEM in baseMT, fixed a missed real_or_imag --> component 2016-05-10 19:57:16 -07:00
Lindsey Heagy 11e6b452c9 renamed FDEM.py to ProblemFDEM.py, changed real_or_imag to component 2016-05-10 17:26:16 -07:00
Lindsey Heagy 73c219ff5c updated Problem naming in casing example 2016-05-09 12:29:52 -07:00
Lindsey Heagy abd919e862 Merge branch 'dev' into em/dev 2016-05-09 11:32:59 -07:00
Lindsey 6e00b4c2fe Merge pull request #312 from simpeg/em/ref/fdem_cleanup
Em/ref/fdem cleanup
2016-05-09 08:25:39 -07:00
Lindsey 906cca30f3 Merge pull request #311 from simpeg/feat/cyl2cartinterp
Feat/cyl2cartinterp
2016-05-09 08:24:16 -07:00
seogi_macbook 8803956d83 Working on SIP 2016-05-09 19:58:56 +09:00
Lindsey Heagy 0a714663d3 update Jtvec to work with Rx classes 2016-05-08 13:12:37 -07:00