Lindsey Heagy 6de786c972 Merge branch 'em/dev' into em/ref/tdem ...

# Conflicts:
#	SimPEG/EM/FDEM/FDEM.py
#	SimPEG/EM/FDEM/SrcFDEM.py
#	SimPEG/EM/FDEM/SurveyFDEM.py
#	SimPEG/Examples/EM_FDEM_1D_Inversion.py

2016-05-11 09:21:59 -07:00

..

em

sketching out TDEM problem

2016-02-22 11:04:18 -08:00

examples

updated Problem naming in casing example

2016-05-09 12:29:52 -07:00

flow

Updates to the correct pointer for the flow module (docs)

2016-01-14 15:57:15 -08:00

images

organizing toctree in EM docs

2016-02-06 15:06:23 -08:00

mt

Updates to the documentation.

2016-01-14 15:56:35 -08:00

api_bigPicture.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

api_DataMisfit.rst

Rearrange Framework

2014-05-17 00:14:22 -07:00

api_DC.rst

Updates to docs

2014-07-12 18:28:17 -05:00

api_DiffOps.rst

docs updates and notation changes

2014-02-26 16:25:40 -08:00

api_Examples.rst

Updates to examples and documentation.

2015-11-24 22:09:50 -08:00

api_FiniteVolume.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

api_ForwardProblem.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

api_InnerProducts.rst

LRM --> Curv

2015-05-14 23:35:38 -07:00

api_installing.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

api_Inversion.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

api_InversionComponents.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

api_Maps.rst

updates to maps docs

2014-07-12 18:38:53 -05:00

api_Mesh.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

api_MeshCode.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

api_Optimization.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

api_Regularization.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

api_Solver.rst

Documentation updates

2014-05-17 22:10:31 -07:00

api_Tests.rst

Update the examples init.py to explicitly reference things.

2016-01-02 18:06:49 -08:00

api_Utilities.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

api_Utils.rst

Updates to the documentation.

2016-01-10 17:21:01 -08:00

conf.py

Bump version: 0.1.9 → 0.1.10

2016-03-23 13:04:18 -07:00

index.rst

fixed merge conflict in examples __init__.py

2016-02-16 16:14:41 -08:00

InversionWorkflow-PreSimPEG.png

Updates to the documentation.

2016-01-10 17:21:01 -08:00

InversionWorkflow.png

updated inversion workflow image, discretization --> mesh and colors are same as in paper

2015-07-21 14:31:22 -07:00

make.bat

Initial Commit.

2014-05-13 09:25:25 -07:00

Makefile

Initial Commit.

2014-05-13 09:25:25 -07:00

simpeg-framework.png

Rearrange Framework

2014-05-17 00:14:22 -07:00

simpeg-logo.png

Initial Commit.

2014-05-13 09:25:25 -07:00

SimPEGFrameworkRevised.png

LRM --> Curv

2015-05-14 23:35:38 -07:00