wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-06-30 14:42:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,965 Commits 28 Branches 6 Tags
a31319b46ee80a7d18d32e55b8f3805b4400a63d
Commit Graph

1965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
seogi_macbook a31319b46e Merge branch 'master' of https://github.com/simpeg/simpeg into dcip/dev 2016-04-05 21:49:38 -07:00
Lindsey aad596a8cc Merge pull request #282 from simpeg/example/EM_FDEM_1D_Inversion/patch 
Better list comprehension.
 2016-04-05 17:41:05 -07:00
Rowan Cockett 8d6bd65923 Better list comprehension. 2016-04-05 14:26:45 -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
D Fournier fdc081970e Merge branch 'feat/sparse-regularization' into dcip/dev 2016-03-21 15:03:59 -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
Lindsey Heagy 7fd6ddf62a Merge branch 'master' into dev 2016-03-13 11:18:05 -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 838035adae fixed indentation level on test_regularization 2016-03-10 14:30:43 -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 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 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 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 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 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 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 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