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

178 Commits

Author SHA1 Message Date
D Fournier 09f3f7b55b Merge branch 'dev' into dcip/dev 2016-04-06 09:03:37 -07:00
seogi_macbook fb1ff4e867 Merge branch 'dev' of https://github.com/simpeg/simpeg into dcip/dev 2016-04-05 21:50:03 -07:00
seogi_macbook a31319b46e Merge branch 'master' of https://github.com/simpeg/simpeg into dcip/dev 2016-04-05 21:49:38 -07:00
Lindsey Heagy 756b738ef2 Merge branch 'dev' into docs 2016-04-05 17:47:17 -07:00
Lindsey Heagy 021e7c794c Merge branch 'master' into docs 
# Conflicts:
#	SimPEG/Mesh/TensorMesh.py
 2016-03-29 22:53:16 -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 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
Lindsey 46a8707b64 Merge pull request #257 from simpeg/em/dev 
Em/dev
 2016-03-08 16:36:30 -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
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
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 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
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 bcda60815e - rx.projectFields --> rx.eval 
- rx.projectFieldsDeriv --> rx.evalDeriv
 2016-02-21 15:31:02 -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 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 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 922bdf93e1 Merge pull request #246 from simpeg/ref/MappingNotation 
Naming conventions in Maps (re #231)
 2016-02-19 17:25:11 -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
Lindsey Heagy 4067106956 fixed merge conflict in examples __init__.py 2016-02-16 16:14:41 -08:00
Lindsey Heagy 20f7f9be1d updated map names in TDEM testing 2016-02-14 21:23:38 -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 999a37547e Merge branch 'dev' into docs 
# Conflicts:
#	.travis.yml
#	SimPEG/EM/FDEM/FDEM.py
#	SimPEG/Mesh/TensorMesh.py
 2016-02-09 08:32:41 -08:00
Rowan Cockett 7a6d0c9fdd Updates to SimPEG.DCIP 2016-02-05 15:09:52 -08:00
Lindsey Heagy 73edef5eb7 the forward for all fields and fluxes can be computed from any formulation (todo: derive) 2016-02-04 19:34:16 -08:00
Lindsey Heagy 8a7e72f3e8 Merge branch 'em/dev' into em/rx 
# Conflicts:
#	SimPEG/EM/FDEM/FDEM.py
#	SimPEG/Mesh/TensorMesh.py
 2016-02-04 19:01:43 -08:00
Rowan Cockett 8262ee94bc Initial commit of DCIP. 2016-02-04 17:03:42 -08:00
Lindsey Heagy 5b78d69c6d use set diff for testing if all examples have been included 2016-02-04 09:11:23 -08:00
Lindsey Heagy b81b5af461 use abspath for travis 2016-02-03 20:23:31 -08:00
Lindsey Heagy 32c936c4e3 add test to ensure examples are up to date 2016-02-03 19:55:42 -08:00
Lindsey Heagy 92b5435149 Merge branch 'dev' into em/dev 2016-02-01 22:12:22 -08:00
Lindsey Heagy 6b359f49b5 docs clean-up (using autoclass is more stable than automodule) 2016-01-31 15:21:46 -08:00
Lindsey Heagy d9d6f70958 better description of paths in test_docs 2016-01-31 12:45:51 -08:00
Lindsey Heagy f4ef767764 seperate out docs test so it runs independently (not on every test) 2016-01-31 12:08:29 -08:00
Rowan Cockett ef201be832 Merge branch 'dev' of https://github.com/simpeg/simpeg into mt/dev 
Conflicts:
	SimPEG/Utils/meshutils.py
	docs/index.rst
	tests/mesh/test_MeshIO.py
 2016-01-29 11:46:19 -08:00
Rowan Cockett 0704c6dc25 Merge pull request #213 from simpeg/feat/treeMeshCounting 
Tree Mesh Updates
 2016-01-28 22:36:48 -08:00
Rowan Cockett caba2b6752 Merge pull request #191 from simpeg/ActiveCellReg 
Meshless Identity Map, Regularization for Active Cell models
 2016-01-28 22:28:08 -08:00
Rowan Cockett 43c49d5f15 Address mesh IO #212 2016-01-28 17:53:10 -08:00
Rowan Cockett 67d3cb4d9b Merge branch 'dev' of https://github.com/simpeg/simpeg into feat/treeMeshCounting 
Conflicts:
	.travis.yml
	SimPEG/Utils/__init__.py
 2016-01-28 14:26:21 -08:00
Rowan Cockett 09161ff68e Hopefully get a better error message on travis. 2016-01-28 13:58:32 -08:00