Merge branch 'dev' into em/dev

This commit is contained in:
Lindsey Heagy
2016-02-01 22:12:22 -08:00
21 changed files with 1414 additions and 988 deletions
+1 -1
View File
@@ -41,7 +41,7 @@ Here we reproduce the results from Celia et al. (1990):
Richards
========
.. automodule:: simpegFLOW.Richards.Empirical
.. automodule:: SimPEG.FLOW.Richards.Empirical
:show-inheritance:
:members:
:undoc-members:
+9 -8
View File
@@ -44,6 +44,15 @@ About SimPEG
api_bigPicture
api_installing
Examples
********
.. toctree::
:maxdepth: 2
api_Examples
Packages
********
@@ -53,14 +62,6 @@ Packages
em/index
flow/index
Examples
********
.. toctree::
:maxdepth: 2
api_Examples
Finite Volume
*************