wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-06-28 13:20:13 +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
Lindsey 7c2d803dfe Merge pull request #225 from simpeg/patch/docsbadges 
make travis badge look at master for docs
 2016-02-02 09:54:43 -08:00
Lindsey abc464ab46 Merge pull request #224 from simpeg/patch/docsbadges 
make travis badge look at master for docs
 2016-02-02 08:13:35 -08:00
Lindsey Heagy 2adc7d4eb9 make travis badge look at master for docs 2016-02-01 22:31:12 -08:00
Lindsey Heagy 92b5435149 Merge branch 'dev' into em/dev 2016-02-01 22:12:22 -08:00
D Fournier 78584ae49d Create pseudo-section simulation in Notebook. 
Sub-functions added to BaseDC. Required for the simulation
 2016-02-01 21:03:58 -08:00
D Fournier b16b1b7526 Add ModelBuilder sphere model. 
Add example for DC pseudo section -> Requires a pull request in SimpegDC for dependancies.
 2016-02-01 21:02:11 -08:00
Lindsey 28a8a2ea80 Merge pull request #217 from simpeg/em/inversioncleanup 
Em/inversioncleanup
 2016-02-01 19:23:39 -08:00
Lindsey Heagy cbe8758465 corrected scipy.sparse.csr_matrix, move size descriptions to :return: instead of :type: 2016-02-01 08:22:00 -08:00
D Fournier 04d977f861 Implement and test Directive for sparse norm... need clean up. 2016-01-31 15:31:20 -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 2254eedbac indentations clean up in FDEM.py 2016-01-31 13:54:39 -08:00
Lindsey Heagy 012d2cadf1 use intersphinx mapping to get numpy, scipy, matplotlib, python inventories 2016-01-31 13:54:24 -08:00
Lindsey Heagy 841ba61006 clean up the html build 2016-01-31 13:22:36 -08:00
Lindsey Heagy 2874e204ee exclude _static from warnings 2016-01-31 12:52:42 -08:00
Lindsey Heagy adca273565 ignore nonlocal images in sphinx build 2016-01-31 12:46:24 -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
Lindsey Heagy e314bdb740 add sphinx to travis conda install 2016-01-31 11:06:47 -08:00
Lindsey Heagy e005ed8f5f use cd to get into docs directories for testing 2016-01-31 10:51:55 -08:00
D Fournier 254fd1c029 Improved sparse regularization. 
Issue with spyder debugger since last merge with dev...
 2016-01-31 10:50:06 -08:00
Lindsey Heagy ac2e38e89d test docs first 2016-01-31 10:47:00 -08:00
D Fournier 2e3a6ddd96 Merge branch 'dev' into Dom_Dev 2016-01-31 10:33:44 -08:00
Lindsey Heagy ade37fb493 add travis to docs. nit-picky testing on html, latex, link check 2016-01-31 09:51:57 -08:00
GudniRos 8340214d73 Merge branch 'mt/dev' of https://github.com/simpeg/simpeg into mt/dev 2016-01-30 14:18:54 -08:00
GudniRos 451cd46801 Added a clean to the Solver. 2016-01-30 14:11:38 -08:00
D Fournier b4c4841976 Merge 2016-01-29 13:47:13 -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
D Fournier 54ec7187cb Add unitCellGrad to DiffOperators 
Implement SparseRegularization and test on mag problem... works!
 2016-01-29 00:50:59 -08:00
Lindsey Heagy 1457e51fc1 from SimPEG.EM import mu_0 2016-01-28 23:44:02 -08:00
Rowan Cockett 5dab7ac1a8 Merge pull request #216 from simpeg/bug/215 
Closes #215
 2016-01-28 23:32:54 -08:00
Lindsey Heagy 967dc83fa8 fixed merge conflict with em/dev 2016-01-28 23:14:03 -08:00
Rowan Cockett 3431fb46eb Merge branch 'dev' of https://github.com/simpeg/simpeg into bug/215 2016-01-28 23:07:34 -08:00
Rowan Cockett 0704c6dc25 Merge pull request #213 from simpeg/feat/treeMeshCounting 
Tree Mesh Updates
 2016-01-28 22:36:48 -08:00
Lindsey Heagy 37d37369d8 added example to docs 2016-01-28 22:36:39 -08:00
Rowan Cockett b013508270 Fixes #215 2016-01-28 22:33:04 -08:00
Rowan Cockett 20d5582c0f Merge branch 'master' of https://github.com/simpeg/simpeg into dev 2016-01-28 22:29:59 -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
D Fournier 02d840a40e Merge branch 'master' into dom_Optimization_Dev 2016-01-28 18:37:23 -08:00
D Fournier 9f5b2e2dc1 Merge branch 'master' into dom_Optimization_Dev 2016-01-28 18:36:46 -08:00
D Fournier 85b55139e8 Implement simple regularization 
Modified the Optimization.ProjectedGNCG to allow active cells back in.
Fix problem regarding the Directive.TargetMisfit --> Survey.Linear had wrong nD value
 2016-01-28 18:36:34 -08:00
Rowan Cockett 43c49d5f15 Address mesh IO #212 2016-01-28 17:53:10 -08:00
Rowan Cockett 1bcb572c45 Remove ifmain from TreeMesh 2016-01-28 14:29:45 -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 860bd5638a Add VTK to the travis dependencies. 
I am not adding this to the requirements.txt file.
 2016-01-28 14:19:29 -08:00
Lindsey Heagy 4bcc9e0850 - name cleanup in Jvec and Jtvec (use u instead of f to be consistent with the rest of SimPEG) 
- example 1D inversion for FDEM
 2016-01-28 14:00:47 -08:00
Rowan Cockett 09161ff68e Hopefully get a better error message on travis. 2016-01-28 13:58:32 -08:00
Lindsey Heagy c24416ea12 use the std and eps from survey in definition of data misfit if defined (and demonstrate it with the TDEM example) 2016-01-28 13:20:48 -08:00
Lindsey Heagy f5333f35a2 use survey.createSyntheticData to make synthetic data 2016-01-28 13:07:48 -08:00
GudniRos 2702c3573b Merge branch 'mt/dev' of https://github.com/simpeg/simpeg into mt/dev 2016-01-28 13:04:47 -08:00
Lindsey Heagy d50232b385 give Zero a transpose 2016-01-28 13:04:13 -08:00