Merge branch 'dev' into feat/docs-deploy

# Conflicts:
#	SimPEG/Mesh/View.py
This commit is contained in:
Lindsey Heagy
2016-05-30 15:56:24 -07:00
5 changed files with 103 additions and 175 deletions
@@ -1,4 +1,4 @@
.. _examples_Forward_BasicDirectCurrent:
.. _examples_Mesh_Basic_ForwardDC:
.. --------------------------------- ..
.. ..
@@ -8,14 +8,18 @@
.. ..
.. --------------------------------- ..
Forward BasicDirectCurrent
==========================
Mesh: Basic Forward 2D DC Resistivity
=====================================
2D DC forward modeling example with Tensor and Curvilinear Meshes
.. plot::
from SimPEG import Examples
Examples.Forward_BasicDirectCurrent.run()
Examples.Mesh_Basic_ForwardDC.run()
.. literalinclude:: ../../SimPEG/Examples/Forward_BasicDirectCurrent.py
.. literalinclude:: ../../SimPEG/Examples/Mesh_Basic_ForwardDC.py
:language: python
:linenos: