8 Commits

Author SHA1 Message Date
D Fournier 66ee0f0422 Merge branch 'dev' into pf/dev
Conflicts:
	.gitignore
	SimPEG/Examples/__init__.py
2016-06-30 13:55:57 -07:00
Rowan Cockett ba173674ec Mesh2Mesh and Combo Map examples.
Also fixed plotting codes to show the plots by default.
2016-06-26 17:07:07 -06:00
Rowan Cockett a79fc7456d Change headers in docs. 2016-06-22 12:27:05 -06:00
Rowan Cockett 4074c67bcf Initial merge and minor refactor of simpegPF. 2016-06-22 12:25:08 -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 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