rowanc1 cfb0a7f447 Merge branch 'master' of https://github.com/simpeg/simpeg into cylClean ...

Conflicts:
	SimPEG/Mesh/LogicallyRectMesh.py
	SimPEG/Mesh/TensorMesh.py
	SimPEG/Mesh/__init__.py
	SimPEG/Tests/TestUtils.py
	SimPEG/Tests/test_operators.py

2014-03-06 18:17:39 -08:00

..

Mesh

Merge branch 'master' of https://github.com/simpeg/simpeg into cylClean

2014-03-06 18:17:39 -08:00

Tests

Merge branch 'master' of https://github.com/simpeg/simpeg into cylClean

2014-03-06 18:17:39 -08:00

Utils

isScalar in Utils (tested) and support for scalar inner products and derivatives (tested).

2014-03-04 12:19:57 -08:00

__init__.py

Removed Examples dir, and put it up a level (outside SimPEG path) renamed to tutorials for future tutorial development.

2014-02-12 10:23:38 -08:00

Data.py

updates to problem and data.

2014-02-26 09:16:41 -08:00

Inversion.py

change modelObj2Deriv from (self) --> (self, m, v=None)

2014-03-02 20:15:29 -08:00

Model.py

Added nonLinearModel Object

2014-02-25 12:14:59 -08:00

ObjFunction.py

change modelObj2Deriv from (self) --> (self, m, v=None)

2014-03-02 20:15:29 -08:00

Optimization.py

change modelObj2Deriv from (self) --> (self, m, v=None)

2014-03-02 20:15:29 -08:00

Parameters.py

change modelObj2Deriv from (self) --> (self, m, v=None)

2014-03-02 20:15:29 -08:00

Problem.py

make modelPair be OK in problem if first ComboModel is the right one.

2014-03-02 18:39:31 -08:00

Regularization.py

change modelObj2Deriv from (self) --> (self, m, v=None)

2014-03-02 20:15:29 -08:00

setup.py

Moved things around! Packages should now all be capitalized. may need to to tweak git to ensure this...

2014-01-16 13:19:29 -08:00

Solver.py

bug fix for windows compatability on solver.

2014-03-02 09:51:04 -08:00