D Fournier 66ee0f0422 Merge branch 'dev' into pf/dev ...

Conflicts:
	.gitignore
	SimPEG/Examples/__init__.py

2016-06-30 13:55:57 -07:00

..

DCIP

Doc testing, I think that is most of them!

2016-05-29 22:18:22 -07:00

EM

Fixes for kwargs variables in FDEMDipolarfields.py

2016-06-29 13:09:11 -07:00

Examples

Merge branch 'dev' into pf/dev

2016-06-30 13:55:57 -07:00

FLOW

Doc testing, I think that is most of them!

2016-05-29 22:18:22 -07:00

Mesh

Merge branch 'dev' into feat/docs-deploy

2016-05-30 15:56:24 -07:00

MT

Rename Vertical1DMap to SurjectVertical1D due to depreciation.

2016-05-29 18:14:42 -07:00

PF

Updates to the asset folder location.

2016-06-22 12:38:19 -06:00

Utils

Doc testing, I think that is most of them!

2016-05-29 22:18:22 -07:00

__init__.py

Bump version: 0.1.11 → 0.1.12

2016-06-29 09:49:29 -07:00

DataMisfit.py

f for fields in data misfit, directives etc. Previously, f was used in the InvProblem to be the function value for the objective function --> this has been renamed to phi

2016-03-31 09:28:48 -07:00

Directives.py

Merge pull request #332 from simpeg/ref/regularization

2016-06-29 08:39:29 -07:00

Fields.py

updates to the time fields side of things as well

2015-06-01 16:27:31 -07:00

Inversion.py

remove mutable arguments.

2016-04-07 16:35:47 -07:00

InvProblem.py

f for fields in data misfit, directives etc. Previously, f was used in the InvProblem to be the function value for the objective function --> this has been renamed to phi

2016-03-31 09:28:48 -07:00

Maps.py

Merge pull request #332 from simpeg/ref/regularization

2016-06-29 08:39:29 -07:00

Models.py

initial commit of PropMap

2015-05-31 10:43:23 -07:00

Optimization.py

Merge branch 'dev' into feat/docs-gae-travis-deploy

2016-06-11 07:14:00 -07:00

Problem.py

f for fields in data misfit, directives etc. Previously, f was used in the InvProblem to be the function value for the objective function --> this has been renamed to phi

2016-03-31 09:28:48 -07:00

PropMaps.py

Doc testing, I think that is most of them!

2016-05-29 22:18:22 -07:00

Regularization.py

Merge branch 'dev' into feat/docs-gae-travis-deploy

2016-06-11 07:14:00 -07:00

Survey.py

Change to NotImplementedError.

2016-06-22 11:32:54 -06:00

Tests.py

Doc testing, I think that is most of them!

2016-05-29 22:18:22 -07:00