Rowan Cockett c9dc29bf89 Merge branch 'master' of https://bitbucket.org/rcockett/simpeg into diffOperators ...

Conflicts:
	SimPEG/sputils.py

Resolved conflicts.

2013-07-18 14:08:44 -07:00

..

EldadsCode

renamed folder 'code' to 'SimPEG'

2013-07-12 14:21:58 -07:00

tests

Rename based on conventions discussed in meeting.

2013-07-18 14:03:41 -07:00

__init__.py

Merged Seogi's code into the Tensor Mesh code base.

2013-07-18 10:41:58 -07:00

BaseMesh.py

renamed folder 'code' to 'SimPEG'

2013-07-12 14:21:58 -07:00

DiffOperators.py

Rename based on conventions discussed in meeting.

2013-07-18 14:03:41 -07:00

getDiffOpps.py

A few more changes - added mass matrices as well as name conventions

2013-07-18 00:09:48 -07:00

sputils.py

Merge branch 'master' of https://bitbucket.org/rcockett/simpeg into diffOperators

2013-07-18 14:08:44 -07:00

TensorMesh.py

Merged Seogi's code into the Tensor Mesh code base.

2013-07-18 10:41:58 -07:00

TensorView.py

3D plots working!

2013-07-12 15:56:00 -07:00

utils.py

renamed folder 'code' to 'SimPEG'

2013-07-12 14:21:58 -07:00