Commit Graph

1965 Commits

Author SHA1 Message Date
GudniRos b58ba55ffd Merge branch 'mt/iss290' into dev 2016-04-15 12:21:57 -07:00
GudniRos 0d6fe5f7a1 Merge branch 'dev' into mt/iss290 2016-04-15 12:03:09 -07:00
GudniRos 90b0301408 Fixing bug in write out. 2016-04-08 09:40:26 -07:00
GudniRos 083742cb40 Removing repeated directives 2016-04-08 09:34:30 -07:00
GudniRos 8a18e479ab Removed the testProjDeriv (not needed, included in Jvec). 2016-04-07 11:48:17 -07:00
GudniRos f15a628136 Moved the osr import into the projection function. 2016-04-07 09:01:30 -07:00
GudniRos fb60f45a3c Fixed osr import in ediFilesUtils, moved into class which imports only on build up.
Fixed the boolean error in Directives.
2016-04-07 08:46:51 -07:00
Lindsey df3d32cb35 Merge pull request #269 from simpeg/feat/casingexample
Feat/casingexample
2016-04-02 08:47:25 -07:00
Lindsey 99ed4ad50e Merge pull request #274 from simpeg/ref/fforfields
use `f` for fields and `u` for a solution vector
2016-04-02 08:34:04 -07:00
Lindsey Heagy b531c162a2 tab so we don't cut off the first characters in the docstring 2016-03-31 23:50:35 -07:00
Lindsey Heagy c7883673bf added the figshare doi link for the example 2016-03-31 09:36:55 -07:00
Lindsey Heagy d8d8915f94 f for fields in data misfit, directives etc. Previously, f was used in the InvProblem to be the function value for the objective function --> this has been renamed to phi 2016-03-31 09:28:48 -07:00
Lindsey 35c6d50db1 Merge pull request #272 from simpeg/em/dev
Em/dev
2016-03-30 07:17:54 -07:00
Lindsey Heagy 0a0caceaca Problem.Jvec, Problem.Jtvec, Problem.fields, DataMisfit, survey.dpred take a fields object f (not a solution vector, u) 2016-03-29 22:49:03 -07:00
Lindsey 44049bb48c Merge pull request #270 from simpeg/master
bumpversion
2016-03-29 20:57:15 -07:00
Lindsey 1d208a8747 Merge pull request #267 from simpeg/em/ref/notation
Em/ref/notation
2016-03-29 15:46:16 -07:00
Lindsey Heagy b6438688d8 removed link for Schenkel paper (it seems to time-out) 2016-03-29 15:40:06 -07:00
Lindsey Heagy 824ce64c7e more descriptive titles 2016-03-29 14:56:56 -07:00
Lindsey Heagy 7aa5599211 improve the description 2016-03-29 14:41:45 -07:00
Lindsey Heagy fbec011983 typo fix 2016-03-29 14:29:39 -07:00
Lindsey Heagy 5fb8cdb88c example casing forward simulation to calculate vertical current 2016-03-29 13:00:37 -07:00
Lindsey Heagy b4f329f65a Bump version: 0.1.9 → 0.1.10 v0.1.10 2016-03-23 13:04:18 -07:00
Lindsey 82c1afd128 Merge pull request #265 from simpeg/dev
Dev
2016-03-23 12:43:33 -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
Lindsey Heagy 7fd6ddf62a Merge branch 'master' into dev 2016-03-13 11:18:05 -07:00
Lindsey 46a8707b64 Merge pull request #257 from simpeg/em/dev
Em/dev
2016-03-08 16:36:30 -08:00
Lindsey 6a2caf5efc Merge pull request #263 from simpeg/em/ref/FDEMJvec
Em/ref/fdem jvec
2016-03-07 16:42:35 -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 25cd9c16a7 Merge pull request #261 from simpeg/em/ref/eqlocs
eqlocs --> formulation in em
2016-03-06 23:21:16 -08:00
Lindsey Heagy 8412ad90c2 eqlocs --> formulation in em 2016-03-06 21:01:58 -08:00
Lindsey cb2151b1d6 Merge pull request #236 from simpeg/dcip/dev
DC merge.
2016-03-06 08:08:13 -08:00
seogi_macbook 20c35f3d16 clean up import solver 2016-03-04 11:04:11 -08:00
seogi_macbook 5d67f79257 Reduce size of the test.
Travis is not using pymatsolver for dcip branch. This should be fixed.
2016-03-04 10:45:28 -08:00
seogi_macbook 9062f6d326 trying to pass travis 2016-03-04 10:35:20 -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 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 6e0a54b319 Merge pull request #255 from simpeg/em/rx
Em/rx
2016-02-27 16:08:16 -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