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

Conflicts:
	.gitignore
	SimPEG/utils/__init__.py
This commit is contained in:
Rowan Cockett
2013-11-12 11:24:40 -08:00
7 changed files with 186 additions and 383 deletions
+2 -3
View File
@@ -3,14 +3,13 @@ import sputils
import lomutils
import interputils
import ModelBuilder
import Solver
from Solver import Solver
from matutils import getSubArray, mkvc, ndgrid, ind2sub, sub2ind
from sputils import spzeros, kron3, speye, sdiag
from lomutils import volTetra, faceInfo, inv2X2BlockDiagonal, inv3X3BlockDiagonal, indexCube, exampleLomGird
from interputils import interpmat
from ipythonUtils import easyAnimate as animate
import Solver
from Solver import Solver
def setKwargs(obj, **kwargs):
"""Sets key word arguments (kwargs) that are present in the object, throw an error if they don't exist."""