wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-06-27 19:48:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,251 Commits 28 Branches 6 Tags
ref/dcip-removal
Commit Graph

228 Commits

Author SHA1 Message Date
Rowan Cockett 51c112a529 Updates to documentation and DC utilities. 2016-06-26 16:07:35 -06:00
Lindsey Heagy ef382aed85 Merge branch 'master' into dev 2016-06-21 18:43:28 -06:00
Lindsey Heagy 7a82f57367 - doc the simple regularization, sparse regularization and regularization mesh 
- typo fix in MT_3D_Forward example - Solver
- use EM.Static.DC for DC example
 2016-06-11 08:16:22 -07:00
Lindsey Heagy b023adbb33 add encrypted credentials for gae site and decrypt on travis 2016-05-31 23:03:55 -07:00
Lindsey Heagy 279bd49b4c Bump version: 0.1.10 → 0.1.11 2016-05-31 15:38:05 -07:00
Lindsey Heagy 3398d5ab4d use templates in conf.py, add google analytics to docs 2016-05-31 15:33:19 -07:00
Lindsey Heagy 01e19e4227 start of gae site 2016-05-30 22:01:15 -07:00
Lindsey Heagy 9fbdaaf0a5 fix typo in examples path 2016-05-30 21:12:31 -07:00
Lindsey Heagy 2a159e20b9 update docs for examples to point to the correct path 2016-05-30 20:34:10 -07:00
Lindsey Heagy 5e8d3fbc78 organizing the docs - put the content in a content folder. put the SimPEG core api docs in core_api 2016-05-30 17:06:29 -07:00
Lindsey Heagy 414418a996 Merge branch 'dev' into feat/docs-deploy 
# Conflicts:
#	SimPEG/Mesh/View.py
 2016-05-30 15:56:24 -07:00
Rowan Cockett 40f0874dfb Doc testing, I think that is most of them! 2016-05-29 22:18:22 -07:00
Rowan Cockett 231e6dbc93 Suppress image warning. 2016-05-29 19:22:15 -07:00
Rowan Cockett 18f98b2ecd Merge branch 'docs' of https://github.com/simpeg/simpeg into feat/docs-deploy 
# Conflicts:
#	SimPEG/Utils/meshutils.py
#	docs/api_Utils.rst
#	docs/conf.py
#	docs/flow/index.rst
 2016-05-29 19:18:36 -07:00
Rowan Cockett bc073e49b5 Updates to docs errors. 2016-05-29 18:57:38 -07:00
Rowan Cockett 74f5395573 Surject1D updates. 2016-05-29 18:25:42 -07:00
Rowan Cockett e2bb9c8d8e rename flow example. 2016-05-29 18:12:52 -07:00
Rowan Cockett 12a12c7b5a updates to FDEM docs. 2016-05-29 17:51:41 -07:00
Rowan Cockett 0b4215f33e Add DC and IP docs. 2016-05-29 17:45:49 -07:00
Rowan Cockett 5e2a8232a3 Minor updates to titles in examples. 2016-05-29 17:21:37 -07:00
Rowan Cockett 4844b7230a TOC updates for docs index. 2016-05-29 17:05:42 -07:00
Lindsey Heagy f2e13182bf Merge branch 'dev' into feat/plotImage-curvilinear 
# Conflicts:
#	SimPEG/Examples/__init__.py
 2016-05-29 16:43:40 -07:00
Lindsey Heagy 62eb4541cb update example name --> based on mesh 2016-05-29 15:48:15 -07:00
D Fournier 406703f1c6 Merge branch 'dev' into ref/dev 
Conflicts:
	docs/examples/DC_Forward_PseudoSection.rst
 2016-05-27 11:10:39 -07:00
Lindsey Heagy 73c219ff5c updated Problem naming in casing example 2016-05-09 12:29:52 -07:00
Lindsey Heagy dd45a6a085 name updates in DC_Forward_PseudoSection, DC_Utils, example for Utils_surface2ind_topo 2016-05-02 11:40:02 -07:00
D Fournier e305600de5 Update example list. Add comments for the DC_Forward_PseudoSection example. Fix Z of pseudo section plot. 2016-04-07 13:09:28 -07:00
Lindsey Heagy 636d178fbf removed examples that are in Examples PR 2016-04-06 16:19:39 -07:00
Lindsey Heagy ae9ca6cec9 Merge branch 'feat/sparse-regularization' into patch/sparse-dcip 
# Conflicts:
#	SimPEG/Examples/__init__.py
#	SimPEG/Optimization.py
 2016-04-06 14:53:45 -07:00
Lindsey Heagy 756b738ef2 Merge branch 'dev' into docs 2016-04-05 17:47:17 -07:00
D Fournier 7a6f4e0780 Merge branch 'master' into feat/sparse-regularization 2016-04-03 17:26:57 -07:00
D Fournier 16d62a6d0a Merge branch 'Examples' into feat/sparse-regularization 
Conflicts:
	SimPEG/Examples/__init__.py
 2016-04-03 11:11:35 -07:00
Lindsey Heagy b531c162a2 tab so we don't cut off the first characters in the docstring 2016-03-31 23:50:35 -07:00
Lindsey Heagy c7883673bf added the figshare doi link for the example 2016-03-31 09:36:55 -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 7aa5599211 improve the description 2016-03-29 14:41:45 -07:00
Lindsey Heagy fbec011983 typo fix 2016-03-29 14:29:39 -07:00
Lindsey Heagy 5fb8cdb88c example casing forward simulation to calculate vertical current 2016-03-29 13:00:37 -07:00
Lindsey Heagy b4f329f65a Bump version: 0.1.9 → 0.1.10 2016-03-23 13:04:18 -07:00
Lindsey Heagy b5b70390cb Merge branch 'dev' into docs 2016-03-06 21:50:27 -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
Rowan Cockett 059850f282 Clean examples and remove duplicate. 2016-02-16 09:41:24 -08:00
seogi_macbook 3a506b9051 Fix DC examples ... 2016-02-11 08:54:44 -08:00
seogi_macbook fa6bcd3ffa Minor changes 2016-02-11 00:10:25 -08:00
seogi_macbook 47895ef270 consistent file name 2016-02-10 23:58:48 -08:00
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
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
Lindsey Heagy 00774176f3 cleanup of math 2016-02-08 08:55:02 -08:00