diff --git a/SimPEG/Mesh/TensorMesh.py b/SimPEG/Mesh/TensorMesh.py index c76306fe..d2353c55 100644 --- a/SimPEG/Mesh/TensorMesh.py +++ b/SimPEG/Mesh/TensorMesh.py @@ -197,9 +197,10 @@ class BaseTensorMesh(BaseMesh): Determines if a set of points are inside a mesh. :param numpy.ndarray pts: Location of points to test - :rtype numpy.ndarray - :return inside, numpy array of booleans + :rtype numpy.ndarray: + :return inside, numpy array of booleans: """ + pts = Utils.asArray_N_x_Dim(pts, self.dim) tensors = self.getTensor(locType) @@ -234,6 +235,7 @@ class BaseTensorMesh(BaseMesh): 'N' -> scalar field defined on nodes 'CC' -> scalar field defined on cell centers """ + if self._meshType == 'CYL' and self.isSymmetric and locType in ['Ex','Ez','Fy']: raise Exception('Symmetric CylMesh does not support %s interpolation, as this variable does not exist.' % locType) diff --git a/SimPEG/Utils/meshutils.py b/SimPEG/Utils/meshutils.py index 585fcc9a..80ca0118 100644 --- a/SimPEG/Utils/meshutils.py +++ b/SimPEG/Utils/meshutils.py @@ -321,13 +321,15 @@ def writeVTRFile(fileName,mesh,model=None): def ExtractCoreMesh(xyzlim, mesh, meshType='tensor'): """ - Extracts Core Mesh from Global mesh - xyzlim: 2D array [ndim x 2] - mesh: SimPEG mesh - This function ouputs: - - actind: corresponding boolean index from global to core - - meshcore: core SimPEG mesh - Warning: 1D and 2D has not been tested + Extracts Core Mesh from Global mesh + xyzlim: 2D array [ndim x 2] + mesh: SimPEG mesh + + This function ouputs: + - actind: corresponding boolean index from global to core + - meshcore: core SimPEG mesh + + Warning: 1D and 2D has not been tested """ from SimPEG import Mesh if mesh.dim ==1: diff --git a/docs/api_Solver.rst b/docs/api_Solver.rst index d96bd9b2..2d237c46 100644 --- a/docs/api_Solver.rst +++ b/docs/api_Solver.rst @@ -46,6 +46,8 @@ The API ======= .. autofunction:: SimPEG.Utils.SolverUtils.SolverWrapD + :noindex: .. autofunction:: SimPEG.Utils.SolverUtils.SolverWrapI + :noindex: diff --git a/docs/api_Utils.rst b/docs/api_Utils.rst index 1bf86516..c3145a41 100644 --- a/docs/api_Utils.rst +++ b/docs/api_Utils.rst @@ -21,7 +21,7 @@ Solver Utilities :undoc-members: Curv Utilities -============= +============== .. automodule:: SimPEG.Utils.curvutils :members: @@ -51,7 +51,9 @@ Interpolation Utilities Counter Utilities ================= -:: +.. code-block:: python + :linenos: + class MyClass(object): def __init__(self, url): self.counter = Counter() @@ -68,8 +70,9 @@ Counter Utilities for i in range(100): c.MyMethod() for i in range(300): c.MySecondMethod() c.counter.summary() + -:: +.. code-block:: none Counters: MyClass.MyMethod : 100 @@ -77,6 +80,8 @@ Counter Utilities Times: mean sum MyClass.MySecondMethod : 1.70e-06, 5.10e-04, 300x + + The API ------- diff --git a/docs/conf.py b/docs/conf.py index 39589e82..c117b152 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -67,7 +67,7 @@ release = '0.1.9' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = ['_build','_static'] +exclude_patterns = ['_build'] # The reST default role (used for this markup: `text`) to use for all documents. #default_role = None @@ -129,7 +129,7 @@ except Exception, e: # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = [] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. diff --git a/docs/flow/index.rst b/docs/flow/index.rst index 3c8083fc..c7960382 100644 --- a/docs/flow/index.rst +++ b/docs/flow/index.rst @@ -35,13 +35,14 @@ Here we reproduce the results from Celia et al. (1990): .. plot:: - from SimPEG.FLOW.Examples import Celia1990 + from SimPEG.Examples import FLOW_Richards_1D_Celia1990 as Celia1990 Celia1990.run() + Richards ======== -.. automodule:: simpegFLOW.Richards.Empirical +.. automodule:: SimPEG.FLOW.Richards.Empirical :show-inheritance: :members: :undoc-members: