wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-06-29 23:25:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,939 Commits 28 Branches 6 Tags
f15a628136264bdcf49b86009204be7c81866450
Commit Graph

1939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
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
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
Lindsey Heagy 0edbc9f6ca docs for fields_e 2016-02-20 11:13:09 -08:00
Lindsey Heagy ce49249664 e,b,h,j with deriv and adjoint from e formulation 2016-02-20 11:05:25 -08:00
Lindsey Heagy 4c3c2c361c - merge em/dev 
- start of j data from e
 2016-02-20 10:13:37 -08:00
Lindsey 40d39d751a Merge pull request #244 from simpeg/em/FDEMfieldsDerivs 
Em/fdem fields derivs
 2016-02-20 09:11:49 -08:00
Lindsey Heagy 649525fa88 keep track of _v with notation 2016-02-19 17:31:43 -08:00
Lindsey 922bdf93e1 Merge pull request #246 from simpeg/ref/MappingNotation 
Naming conventions in Maps (re #231)
 2016-02-19 17:25:11 -08:00
D Fournier cd352dc5f7 Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev 2016-02-19 16:42:13 -08:00
D Fournier a7c35abd56 Major re-write for the IO and pseudo-section function. 
Will need to adapt the example.
 2016-02-19 16:41:59 -08:00
Lindsey Heagy a5be262171 add future warnings for new map names to ensure backwards compatibility (for a time) 2016-02-17 14:32:49 -08:00
Rowan Cockett 16239aa414 Merge branch 'dev' of https://github.com/simpeg/simpeg into dcip/dev 
# Conflicts:
#	SimPEG/Examples/__init__.py
 2016-02-16 22:14:22 -08:00
Rowan Cockett 9bf4a6228d Remove the update_IRLS and move to PR #254. 2016-02-16 22:06:17 -08:00
Rowan Cockett 226a28f611 Remove regularization and diff op changes, and deal with these in a separate PR #254. 2016-02-16 22:01:50 -08:00
Rowan Cockett 4c547d22c6 Move the optimization code into PR #253. 2016-02-16 21:55:21 -08:00
Rowan Cockett fb1973cfe4 Merge pull request #211 from simpeg/mt/dev 
Merge MT into dev
 2016-02-16 17:14:49 -08:00