Commit Graph

1337 Commits

Author SHA1 Message Date
D Fournier fdc081970e Merge branch 'feat/sparse-regularization' into dcip/dev 2016-03-21 15:03:59 -07:00
Lindsey Heagy c66db805af typo fix 2016-03-20 14:44:34 -07:00
Lindsey Heagy 579f1d7a65 FDEM uses f (so the u kwarg breaks). replace with f across the entire codebase?? 2016-03-20 13:36:19 -07:00
Lindsey Heagy c51afa4aad s_m, s_e are vectors (so they should not be capitalized) 2016-03-20 13:04:02 -07:00
Lindsey Heagy cc9d2e5ac7 we don't support m is none 2016-03-20 12:18:07 -07:00
Lindsey Heagy 055061ac3b abstracted FDEM survey to BaseEMSurvey (with methods eval and eval deriv) as this should be common to FDEM and TDEM problems (only implemented on FDEM problem, TDEM inheritance will be taken care of on the TDEM refactor branch) 2016-03-20 12:15:52 -07:00
Lindsey Heagy d5f73d0fd3 f_src is actually u_src 2016-03-20 11:56:58 -07:00
Lindsey Heagy 3d11431f2f use f where we are talking about fields 2016-03-20 11:47:57 -07:00
D Fournier f92ff1301d Add reference model in compact term. 2016-03-17 18:45:09 -07:00
D Fournier d302a59b2c Change the projection from 3D to 2D 2016-03-16 11:43:25 -07:00
D Fournier ef467efce0 Small change to directive 2016-03-15 20:56:38 -07:00
D Fournier d226186c8e Add auto-beta adjustment. 2016-03-11 15:09:31 -08:00
D Fournier 38b4079f0b Move cell-based weights (i.e. distance weighting) inside regularization.
Fix gamma parameter update
TO DO: Check inversion print screen -> values don't match reality.
2016-03-11 11:40:47 -08:00
D Fournier 9d4e2488f3 Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev
Conflicts:
	SimPEG/DCIP/DCIPUtils.py
2016-03-10 14:33:06 -08:00
Lindsey Heagy ef4513bcd4 some cleanup inside of sparse regularization 2016-03-10 14:25:53 -08:00
D Fournier 4fefccc97d Add readPUBC_DC2Dpre 2016-03-10 14:25:27 -08:00
seogi_macbook 1946e1f69e minor change for plotting 2016-03-09 15:49:08 -08:00
Lindsey Heagy 33c9059e4e SparseRegularization --> Sparse 2016-03-08 16:40:02 -08:00
Lindsey 46a8707b64 Merge pull request #257 from simpeg/em/dev
Em/dev
2016-03-08 16:36:30 -08:00
Lindsey Heagy ab1108c9c2 - _fieldType --> _solutionType
- light cleanup of conversion to numpy arrays in Jvec
2016-03-07 13:31:15 -08:00
Lindsey Heagy b30fe88a7a fieldType --> solutionType 2016-03-07 13:07:25 -08:00
Lindsey Heagy d9b3c038c4 Merge branch 'dev' into feat/sparse-regularization
# Conflicts:
#	SimPEG/Regularization.py
#	SimPEG/Survey.py
2016-03-06 23:01:59 -08:00
Lindsey Heagy b5b70390cb Merge branch 'dev' into docs 2016-03-06 21:50:27 -08:00
Lindsey Heagy 8412ad90c2 eqlocs --> formulation in em 2016-03-06 21:01:58 -08:00
seogi_macbook db63779b9b change gen_DCIPsurvey to output survey class 2016-03-03 16:19:53 -08:00
seogi_macbook d31ef027d7 comment regularizations 2016-03-03 15:14:49 -08:00
seogi_macbook f73d0a3b4a Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev
Conflicts:
	SimPEG/Regularization.py
2016-03-03 15:12:05 -08:00
seogi_macbook e4506a8773 blah 2016-03-03 14:54:00 -08:00
seogi_macbook e4cbc584dc ss 2016-03-03 14:06:18 -08:00
Lindsey Heagy 2f8b8a36bf smoothModel --> mrefInSmooth 2016-03-02 09:46:50 -08:00
Lindsey Heagy 834de58284 projectFields --> eval 2016-03-01 18:02:33 -08:00
Lindsey Heagy cba52c3b81 Merge branch 'dev' into dcip/dev
# Conflicts:
#	SimPEG/Examples/Inversion_Linear.py
2016-03-01 17:56:10 -08:00
Lindsey Heagy 5e5c7ba0fb docs for regmesh, cellGrad--> cellDiff, faceDiv--> faceDiff for regmesh 2016-03-01 17:31:37 -08:00
Lindsey Heagy 5c8fba4242 changing btwn e,j and h,b depends on which formulation we are going between and is now in the fields object 2016-02-27 15:44:07 -08:00
D Fournier 6c33455d15 update Directive for sparse norm 2016-02-25 08:56:18 -08:00
D Fournier 7000699e38 Merge branch 'feat/sparse-regularization' of https://github.com/simpeg/simpeg into feat/sparse-regularization 2016-02-24 21:00:02 -08:00
D Fournier 63bf8b9e4d Add linear survey 2016-02-24 20:59:51 -08:00
Lindsey Heagy e3af1fd94e convert indActive to a bool if an integer list is provided 2016-02-24 20:28:09 -08:00
Lindsey Heagy 4e871a43a9 prototype of defining regularization mesh within Regularization.py for constructing operators for regularization that are not true differential operators 2016-02-24 18:03:42 -08:00
D Fournier 020332aec5 DCIP Changes 2016-02-24 15:25:56 -08:00
Lindsey Heagy ac008e7253 Merge branch 'em/dev' into em/rx
# Conflicts:
#	SimPEG/EM/FDEM/SurveyFDEM.py
2016-02-22 11:11:10 -08:00
Lindsey Heagy 52cc92f699 Merge branch 'dev' into em/dev
# Conflicts:
#	SimPEG/EM/FDEM/FDEM.py
2016-02-22 11:07:08 -08:00
Lindsey Heagy bcda60815e - rx.projectFields --> rx.eval
- rx.projectFieldsDeriv --> rx.evalDeriv
2016-02-21 15:31:02 -08:00
Lindsey Heagy f37235973b adjoint debugging 2016-02-21 11:33:15 -08:00
Lindsey Heagy feff936c92 cleanup of tests and debugging derivs 2016-02-21 11:02:29 -08:00
Lindsey Heagy 6aa9b533ba include mu in testing, cleanup and debugging in dipole sources 2016-02-21 10:36:46 -08:00
Lindsey Heagy 4df932ccfc notation cleanup 2016-02-21 10:35:27 -08:00
Lindsey Heagy 3e673d34f1 - each of e,b,h,j from every formulation. Currently, b from j is first order
- removed CCV primary and secondary (dangerous the way it was previously done)
- NOTE: Source derive may not be properly taken care of yet
2016-02-20 17:05:43 -08:00
Lindsey Heagy f1527f994b e,b,h,j from j formulation 2016-02-20 14:30:55 -08:00
Lindsey Heagy 0646a930ab e,b,h,j from b formulation 2016-02-20 13:27:51 -08:00