wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-07-13 12:36:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,201 Commits 28 Branches 6 Tags
mt/dev
Commit Graph

2201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rowan Cockett 2e78e09bd0 Merge branch 'Dom_Dev' of https://github.com/simpeg/simpeg into dcip/dev 2016-02-05 13:51:53 -08:00
Lindsey 72a5009d9d Merge pull request #229 from simpeg/test/examples 
add test to ensure examples are up to date
 2016-02-05 11:13:59 -08:00
Lindsey 5515f7dadd Merge pull request #232 from simpeg/patch/Zero_in_sdiag 
use Zero in sdiag instead of returing h to avoid confusion
 2016-02-05 09:14:46 -08:00
GudniRos 3de8fb5f15 Fixed a spelling error 2016-02-04 23:53:36 -08:00
GudniRos 5705fabc5a Fixed comments from Lindsey and Rowan 2016-02-04 22:38:19 -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
Lindsey Heagy 2fb8de708a use Zero in sdiag instead of returing h to avoid confusion 2016-02-04 18:49:42 -08:00
Rowan Cockett 8262ee94bc Initial commit of DCIP. 2016-02-04 17:03:42 -08:00
sgkang d49a16d7e9 Merge pull request #8 from simpeg/IP 
IP branch
 2016-02-04 11:37:10 -08:00
seogi_macbook 1f1522da01 Minor correction for notebooks 2016-02-04 11:36:27 -08:00
seogi_macbook 0ad24f175b Merge branch 'master' of https://github.com/simpeg/simpegdc into IP 2016-02-04 11:24:39 -08:00
sgkang 7f14c32124 Merge pull request #7 from simpeg/Dom/BaseDC 
Dom/base dc
 2016-02-04 11:22:50 -08:00
seogi_macbook dc6009f9c8 add pymatsolver to travis 2016-02-04 11:12:12 -08:00
D Fournier e2f30ffbb6 Remove unnecessary files for pull request 2016-02-04 11:11:14 -08:00
D Fournier 34acd4876b Merge branch 'master' into Dom_dev 2016-02-04 11:06:53 -08:00
D Fournier ac7ba39732 Add example in preparation for branching off 2016-02-04 11:05:56 -08:00
Rowan Cockett 269269daf7 Merge pull request #6 from simpeg/Dom_dev 
Examples and IP
 2016-02-04 09:17:40 -08:00
Rowan Cockett 9b65fa80c9 getIndicesBlock typo. 2016-02-04 09:16:14 -08:00
Rowan Cockett 2a84f1556e Merge in @sgkang's work on IP. 2016-02-04 09:16:01 -08:00
Lindsey Heagy 5b78d69c6d use set diff for testing if all examples have been included 2016-02-04 09:11:23 -08:00
GudniRos b8bd011662 Added a 3D forward example. Missing plots. 2016-02-04 02:28:22 -08:00
GudniRos 345e39ed43 Updated doc strings, moved functions around and cleaned unused text. 2016-02-04 00:23:07 -08:00
Lindsey Heagy b81b5af461 use abspath for travis 2016-02-03 20:23:31 -08:00
Lindsey Heagy 433457f649 docs and import for DC_PseudoSection_Simulation.rst 2016-02-03 20:12:55 -08:00
D Fournier 3eeb5dbd3c Remove dependency from Utils. Replace by internal function. 2016-02-03 20:03:05 -08:00
Lindsey Heagy 32c936c4e3 add test to ensure examples are up to date 2016-02-03 19:55:42 -08:00
D Fournier df78f7b33a Branch off master 
Add DC_Pseudo_Section example.
 2016-02-03 14:35:03 -08:00
GudniRos 01bf46c8bf Updated example 2016-02-03 14:21:41 -08:00
GudniRos 664589f856 Example for 1D forward and inversion of MT 2016-02-03 14:21:11 -08:00
Lindsey 05ce38013e Merge pull request #223 from simpeg/em/dev 
Em/dev
 2016-02-02 14:35:22 -08:00
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
D Fournier 04d977f861 Implement and test Directive for sparse norm... need clean up. 2016-01-31 15:31:20 -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
D Fournier 2e3a6ddd96 Merge branch 'dev' into Dom_Dev 2016-01-31 10:33:44 -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