Rowan Cockett e622dfb5cc Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev ...

Conflicts:
	.coveragerc
	.gitignore
	.travis.yml
	docs/api_Utils.rst
	docs/conf.py
	docs/index.rst
	requirements.txt
	setup.py

2015-11-04 09:59:11 -08:00

..

em

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -08:00

flow

SimPEG.FLOW

2015-10-30 14:36:51 -07:00

images

documentation updates

2015-07-06 19:04:24 -05:00

api_bigPicture.rst

Updated Inversion Workflow image to be the same as the one in the paper

2014-12-12 13:37:08 -08:00

api_DataMisfit.rst

Rearrange Framework

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

api_DiffOps.rst

docs updates and notation changes

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

api_Examples.rst

Upload notebooks for DC and Seismic Examples - Scipy2014

2014-07-11 22:41:26 -07:00

api_ForwardProblem.rst

forward problem combined in docs

2014-05-17 23:41:05 -07:00

api_InnerProducts.rst

LRM --> Curv

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

api_installing.rst

add more qualifiers to setup.py

2014-07-03 15:12:46 -07:00

api_Inverse.rst

Documentation, type(x) == np.ndarray --> isinstance(x,np.ndarray), and Model (untested.)

2014-05-17 16:50:51 -07:00

api_license.rst

Documentation updates

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

api_Maps.rst

updates to maps docs

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

api_Mesh.rst

Changes LRM to Curvilinear

2015-05-14 14:12:52 -07:00

api_MeshCode.rst

Logically Rectangular --> Curvilinear

2015-05-15 09:08:05 -07:00

api_Solver.rst

Documentation updates

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

api_Tests.rst

Docs reorganization.

2014-02-25 09:51:39 -08:00

api_Utils.rst

lrm --> curv

2015-05-14 23:43:32 -07:00

conf.py

cleaned up math in docs

2015-07-06 23:59:21 -05:00

index.rst

Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

2015-11-04 09:59:11 -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-02-25 11:20:27 -08:00

Makefile

initial commit

2014-02-25 11:20:27 -08:00

simpeg-framework.png

Rearrange Framework

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

simpeg-logo.png

initial commit

2014-02-25 11:20:27 -08:00

SimPEGFrameworkRevised.png

LRM --> Curv

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