wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-06-28 10:01:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,283 Commits 28 Branches 6 Tags
ref/quant-code
Commit Graph

2283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 b5b70390cb Merge branch 'dev' into docs 2016-03-06 21:50:27 -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
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