wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-07-01 17:46:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,897 Commits 28 Branches 6 Tags
4fefccc97dbd5249d68b7b490fb227d423d6c0ee
Commit Graph

1897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
D Fournier 4fefccc97d Add readPUBC_DC2Dpre 2016-03-10 14:25:27 -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
D Fournier 020332aec5 DCIP Changes 2016-02-24 15:25:56 -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 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
Lindsey Heagy 4067106956 fixed merge conflict in examples __init__.py 2016-02-16 16:14:41 -08:00
Lindsey 980a382613 Merge pull request #252 from simpeg/em/dev 
Em/dev
 2016-02-16 16:09:07 -08:00
Rowan Cockett e464fc0dfd Reduce number of frequencies in forward problem MT example. 2016-02-16 14:55:17 -08:00
GudniRos 015b940130 Ran Example/__init__.py 2016-02-16 13:26:58 -08:00
Rowan Cockett 6ccfa71dd7 Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev 2016-02-16 13:01:48 -08:00
Rowan Cockett 1d06b768e2 Remove second derivatives in simple regularization 2016-02-16 13:01:32 -08:00
D Fournier cb9e820eb3 Merge branch 'dcip/dev' of https://github.com/simpeg/simpeg into dcip/dev 2016-02-16 12:36:22 -08:00
D Fournier d6664155c6 Start changing the IO to use Survey class 2016-02-16 12:35:36 -08:00
Rowan Cockett e4c30705ff Clean up whitespace in optimization. 2016-02-16 09:47:07 -08:00
Rowan Cockett 059850f282 Clean examples and remove duplicate. 2016-02-16 09:41:24 -08:00
Lindsey Heagy 20f7f9be1d updated map names in TDEM testing 2016-02-14 21:23:38 -08:00
Lindsey 44359d4306 Merge pull request #245 from simpeg/em/patch-rxprojectfieldsnotation 
use f to denote fields in the project fields and project fields deriv
 2016-02-14 15:43:46 -08:00
Lindsey Heagy 2c4055aec1 Naming conventions in Maps (re #231) 
- FullMap --> SurjectFull
- Vertical1DMap --> SurjectVertical1D
- Map2Dto3D --> Surject2Dto3D
- ActiveCells --> InjectActiveCells
- ActiveCellsTopo --> InjectActiveCellsTopo
 2016-02-14 15:43:32 -08:00
Lindsey Heagy 3f2396ad33 use f to denote fields in the project fields and project fields deriv 2016-02-14 15:10:27 -08:00
seogi_macbook c1bd8edf77 return DCdata class? 2016-02-11 15:29:16 -08:00
seogi_macbook d9c94b9793 Move stuff to DCIPUtils.py 2016-02-11 14:10:44 -08:00
GudniRos 186708f8de Fixed an error with u refactoring 2016-02-10 07:24:49 -08:00
GudniRos c8c034cc2d Changed default input of Jvec for f to u 2016-02-10 07:06:57 -08:00
seogi_macbook 60e18eef01 Working on reading DCIP 3D 2016-02-09 16:11:25 -08:00
Lindsey 463b9b6164 Merge pull request #240 from simpeg/em/dev 
Em/dev
 2016-02-09 08:04:45 -08:00
GudniRos 97336129de Checkout a updated file from Seogi. 2016-02-08 22:25:42 -08:00
GudniRos cdf7c0edc1 Changed the name string. 2016-02-08 22:22:39 -08:00
Lindsey Heagy 92c83c88d4 Merge branch 'em/dev' of https://github.com/simpeg/simpeg into em/dev 2016-02-08 14:01:14 -08:00
Lindsey Heagy 5da9235eb4 light code cleanup 2016-02-08 12:58:04 -08:00
Lindsey e8712a9f4a Merge pull request #238 from simpeg/em/docs 
Em/docs
 2016-02-08 09:27:06 -08:00
Lindsey Heagy 00774176f3 cleanup of math 2016-02-08 08:55:02 -08:00
Lindsey Heagy f9359b7f08 a couple typo fixes 2016-02-07 13:07:40 -08:00