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

1342 Commits

Author SHA1 Message Date
seogi_macbook 774d612c18 Merge branch 'master' of https://github.com/simpeg/simpeg into Examples 
Conflicts:
	SimPEG/Examples/__init__.py
 2016-02-10 23:38:51 -08:00
GudniRos 186708f8de Fixed an error with u refactoring 2016-02-10 07:24:49 -08:00
GudniRos c8c034cc2d Changed default input of Jvec for f to u 2016-02-10 07:06:57 -08:00
seogi_macbook 60e18eef01 Working on reading DCIP 3D 2016-02-09 16:11:25 -08:00
Lindsey Heagy 6acaa81faf fixed merge conflicts in FDEM docs that I missed 2016-02-09 09:03:20 -08:00
Lindsey Heagy 312b5d79c5 resolved merge conflicts in TensorMesh 2016-02-09 08:53:01 -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
Lindsey 463b9b6164 Merge pull request #240 from simpeg/em/dev 
Em/dev
 2016-02-09 08:04:45 -08:00
GudniRos 97336129de Checkout a updated file from Seogi. 2016-02-08 22:25:42 -08:00
GudniRos cdf7c0edc1 Changed the name string. 2016-02-08 22:22:39 -08:00
Lindsey Heagy 92c83c88d4 Merge branch 'em/dev' of https://github.com/simpeg/simpeg into em/dev 2016-02-08 14:01:14 -08:00
Lindsey Heagy 5da9235eb4 light code cleanup 2016-02-08 12:58:04 -08:00
Lindsey Heagy f9359b7f08 a couple typo fixes 2016-02-07 13:07:40 -08:00
Lindsey Heagy 81c13b12e3 cleanup of docs, docs for survey 2016-02-07 13:04:13 -08:00
Lindsey Heagy cb9a70bacc docs for source 2016-02-07 12:53:57 -08:00
Lindsey Heagy e7b69dccfd FDEM Fields object docs 2016-02-07 11:31:00 -08:00
Lindsey Heagy a80eac7dc3 documentation for FDEM.py 2016-02-06 15:05:15 -08:00
Rowan Cockett 7a6d0c9fdd Updates to SimPEG.DCIP 2016-02-05 15:09:52 -08:00
Rowan Cockett bdfabe620a Add the DC examples 2016-02-05 14:01:56 -08:00
Rowan Cockett 9b67956630 Use the linear problem and survey class 2016-02-05 14:01:20 -08:00
Rowan Cockett ac8f26be3e Update DC example. 2016-02-05 14:00:01 -08:00
Rowan Cockett 2e78e09bd0 Merge branch 'Dom_Dev' of https://github.com/simpeg/simpeg into dcip/dev 2016-02-05 13:51:53 -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
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 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
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 Heagy 92b5435149 Merge branch 'dev' into em/dev 2016-02-01 22:12:22 -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 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 841ba61006 clean up the html build 2016-01-31 13:22:36 -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
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
Lindsey Heagy 967dc83fa8 fixed merge conflict with em/dev 2016-01-28 23:14:03 -08:00