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

Conflicts:
	SimPEG/inverse/Optimize.py
	SimPEG/regularization/Regularization.py

SimPEG/forward/Problem.py

@@ -1,5 +1,5 @@
 import numpy as np
-from SimPEG.utils import mkvc, sdiag
+from SimPEG.utils import mkvc, sdiag, count, timeIt
 import scipy.sparse as sp
 norm = np.linalg.norm
 
@@ -37,6 +37,8 @@ class Problem(object):
         to (locally) find how model parameters change the data, and optimize!
     """
 
+    counter = None
+
     def __init__(self, mesh):
         self.mesh = mesh
 
@@ -83,6 +85,7 @@ class Problem(object):
     def dobs(self, value):
         self._dobs = value
 
+    @count
     def dpred(self, m, u=None):
         """
             Predicted data.
@@ -94,6 +97,7 @@ class Problem(object):
             u = self.field(m)
         return self.P*u
 
+    @count
     def dataResidual(self, m, u=None):
         """
             :param numpy.array m: geophysical model
@@ -113,6 +117,7 @@ class Problem(object):
 
         return self.dpred(m, u=u) - self.dobs
 
+    @timeIt
     def J(self, m, v, u=None):
         """
             :param numpy.array m: model
@@ -142,6 +147,7 @@ class Problem(object):
         """
         raise NotImplementedError('J is not yet implemented.')
 
+    @timeIt
     def Jt(self, m, v, u=None):
         """
             :param numpy.array m: model
@@ -155,6 +161,7 @@ class Problem(object):
         raise NotImplementedError('Jt is not yet implemented.')
 
 
+    @timeIt
     def J_approx(self, m, v, u=None):
         """
 
@@ -169,6 +176,7 @@ class Problem(object):
         """
         return self.J(m, v, u)
 
+    @timeIt
     def Jt_approx(self, m, v, u=None):
         """
             :param numpy.array m: model