wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-07-14 11:18:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,961 Commits 28 Branches 6 Tags
abc5d72725952d0ae4a4261d8c09e1a72b4abc6c
Commit Graph

1961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GudniRos abc5d72725 Merge branch 'em/dev' into mt/dev 2016-04-15 13:29:39 -07:00
GudniRos 6482b94cf1 Merge branch 'master' into mt/dev 2016-04-05 10:26:03 -07:00
Lindsey Heagy f59cfa9481 Merge branch 'dev' into em/dev 2016-04-02 08:35:09 -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 a220c75d78 Merge pull request #273 from simpeg/em/patch/srcIntegration 
make integrate = False default for all sources
 2016-03-31 11:17:54 -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 Heagy 936a7aaadc make integrate = False default for all sources 2016-03-29 21:32:08 -07:00
Lindsey 44049bb48c Merge pull request #270 from simpeg/master 
bumpversion
 2016-03-29 20:57:15 -07:00
GudniRos 009806f2ba Merge remote-tracking branch 'origin/dev' into mt/dev 2016-03-29 16:52:01 -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 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
GudniRos 127c51974f Fixed errors in analytic solution 2016-03-10 08:10:21 -08:00
GudniRos e96945b991 Indexing 2016-03-09 14:30:39 -08:00
GudniRos fc444a345f Fixing dtypes in the MT1Danalytic 2016-03-09 14:24:15 -08:00
GudniRos 9a739d8380 Merge branch 'mt/dev' of https://github.com/simpeg/simpeg into mt/dev 2016-03-09 13:27:50 -08:00
GudniRos 664a7bb484 Updated plotting functions for MT 2016-03-09 13:26:50 -08: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
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 8bd4eedb83 Merge pull request #256 from simpeg/ref/rx-eval 
rx.projectFields --> rx.eval
 2016-02-22 11:03:46 -08:00