From 25d79d36367479ab3223a93197d396e0563b8026 Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Sun, 19 Jan 2014 13:39:50 -0700 Subject: [PATCH] Clean Up Documentation --- SimPEG/Mesh/BaseMesh.py | 34 +- SimPEG/Mesh/LogicallyOrthogonalMesh.py | 7 +- SimPEG/Mesh/LomView.py | 15 +- SimPEG/Mesh/TensorMesh.py | 8 +- SimPEG/Mesh/TensorView.py | 37 +- SimPEG/Tests/TestUtils.py | 8 +- SimPEG/Tests/runTests.py | 57 - SimPEG/Tests/runTests.sh | 3 - SimPEG/Utils/meshutils.py | 4 +- docs/api_BaseMesh.rst | 2 +- docs/api_Cyl1DMesh.rst | 4 +- docs/api_DiffOperators.rst | 2 +- docs/api_InnerProducts.rst | 2 +- docs/api_LogicallyOrthogonalMesh.rst | 10 +- docs/api_Optimize.rst | 23 +- docs/api_Problem.rst | 6 +- docs/api_TensorMesh.rst | 9 +- docs/api_TestResults.rst | 3994 ----------------- docs/api_Tests.rst | 2 +- docs/api_Utils.rst | 16 +- .../mesh/plot_LogicallyOrthogonalMesh.py | 7 - docs/examples/mesh/plot_grid_2D.py | 11 - docs/examples/mesh/plot_grid_3D.py | 12 - docs/examples/mesh/plot_image_2D.py | 11 - docs/examples/mesh/plot_image_3D.py | 12 - docs/examples/mesh/plot_nodes.py | 13 - docs/index.rst | 16 +- 27 files changed, 109 insertions(+), 4216 deletions(-) delete mode 100644 SimPEG/Tests/runTests.py delete mode 100644 SimPEG/Tests/runTests.sh delete mode 100644 docs/api_TestResults.rst delete mode 100644 docs/examples/mesh/plot_LogicallyOrthogonalMesh.py delete mode 100644 docs/examples/mesh/plot_grid_2D.py delete mode 100644 docs/examples/mesh/plot_grid_3D.py delete mode 100644 docs/examples/mesh/plot_image_2D.py delete mode 100644 docs/examples/mesh/plot_image_3D.py delete mode 100644 docs/examples/mesh/plot_nodes.py diff --git a/SimPEG/Mesh/BaseMesh.py b/SimPEG/Mesh/BaseMesh.py index 7b656697..672b5c02 100644 --- a/SimPEG/Mesh/BaseMesh.py +++ b/SimPEG/Mesh/BaseMesh.py @@ -147,16 +147,6 @@ class BaseMesh(object): else: return switchKernal(x) - # def n(): - # doc = """ - # Number of Cells in each dimension (array of integers) - - # :rtype: numpy.array - # :return: n - # """ - # fget = lambda self: self._n - # return locals() - # n = property(**n()) def dim(): doc = """ @@ -219,10 +209,10 @@ class BaseMesh(object): :return: nC .. plot:: + :include-source: - from SimPEG.mesh import TensorMesh - import numpy as np - TensorMesh([np.ones(n) for n in [2,3]]).plotGrid(centers=True,showIt=True) + from SimPEG import Mesh, np + Mesh.TensorMesh([np.ones(n) for n in [2,3]]).plotGrid(centers=True,showIt=True) """ fget = lambda self: np.prod(self._n) return locals() @@ -290,10 +280,10 @@ class BaseMesh(object): :return: nN .. plot:: + :include-source: - from SimPEG.mesh import TensorMesh - import numpy as np - TensorMesh([np.ones(n) for n in [2,3]]).plotGrid(nodes=True,showIt=True) + from SimPEG import Mesh, np + Mesh.TensorMesh([np.ones(n) for n in [2,3]]).plotGrid(nodes=True,showIt=True) """ fget = lambda self: np.prod(self.nCv + 1) return locals() @@ -361,10 +351,10 @@ class BaseMesh(object): :return: [prod(nEx), prod(nEy), prod(nEz)] .. plot:: + :include-source: - from SimPEG.mesh import TensorMesh - import numpy as np - TensorMesh([np.ones(n) for n in [2,3]]).plotGrid(edges=True,showIt=True) + from SimPEG import Mesh, np + Mesh.TensorMesh([np.ones(n) for n in [2,3]]).plotGrid(edges=True,showIt=True) """ fget = lambda self: np.array([np.prod(x) for x in [self.nEx, self.nEy, self.nEz] if not x is None]) return locals() @@ -433,10 +423,10 @@ class BaseMesh(object): :return: [prod(nFx), prod(nFy), prod(nFz)] .. plot:: + :include-source: - from SimPEG.mesh import TensorMesh - import numpy as np - TensorMesh([np.ones(n) for n in [2,3]]).plotGrid(faces=True,showIt=True) + from SimPEG import Mesh, np + Mesh.TensorMesh([np.ones(n) for n in [2,3]]).plotGrid(faces=True,showIt=True) """ fget = lambda self: np.array([np.prod(x) for x in [self.nFx, self.nFy, self.nFz] if not x is None]) return locals() diff --git a/SimPEG/Mesh/LogicallyOrthogonalMesh.py b/SimPEG/Mesh/LogicallyOrthogonalMesh.py index dca59026..e39c0f54 100644 --- a/SimPEG/Mesh/LogicallyOrthogonalMesh.py +++ b/SimPEG/Mesh/LogicallyOrthogonalMesh.py @@ -17,8 +17,13 @@ class LogicallyOrthogonalMesh(BaseMesh, DiffOperators, InnerProducts, LomView): Example of a logically orthogonal mesh: - .. plot:: examples/mesh/plot_LogicallyOrthogonalMesh.py + .. plot:: + :include-source: + from SimPEG import Mesh, Utils + X, Y = Utils.exampleLomGird([3,3],'rotate') + M = Mesh.LogicallyOrthogonalMesh([X, Y]) + M.plotGrid(showIt=True) """ __metaclass__ = Utils.Save.Savable diff --git a/SimPEG/Mesh/LomView.py b/SimPEG/Mesh/LomView.py index 8243a248..4eceb918 100644 --- a/SimPEG/Mesh/LomView.py +++ b/SimPEG/Mesh/LomView.py @@ -15,10 +15,18 @@ class LomView(object): def __init__(self): pass - def plotGrid(self, length=0.05): + def plotGrid(self, length=0.05, showIt=False): """Plot the nodal, cell-centered and staggered grids for 1,2 and 3 dimensions. - .. plot:: examples/mesh/plot_LogicallyOrthogonalMesh.py + + .. plot:: + :include-source: + + from SimPEG import Mesh, Utils + X, Y = Utils.exampleLomGird([3,3],'rotate') + M = Mesh.LogicallyOrthogonalMesh([X, Y]) + M.plotGrid(showIt=True) + """ NN = self.r(self.gridN, 'N', 'N', 'M') if self.dim == 2: @@ -92,4 +100,5 @@ class LomView(object): ax.hold(False) ax.set_xlabel('x1') ax.set_ylabel('x2') - fig.show() + + if showIt: plt.show() diff --git a/SimPEG/Mesh/TensorMesh.py b/SimPEG/Mesh/TensorMesh.py index 441cb234..341cfba7 100644 --- a/SimPEG/Mesh/TensorMesh.py +++ b/SimPEG/Mesh/TensorMesh.py @@ -17,19 +17,19 @@ class TensorMesh(BaseMesh, TensorView, DiffOperators, InnerProducts): hy = np.array([1,2]) hz = np.array([1,1,1,1]) - mesh = TensorMesh([hx, hy, hz]) + mesh = Mesh.TensorMesh([hx, hy, hz]) Example of a padded tensor mesh: .. plot:: - from SimPEG import mesh, Utils - M = mesh.TensorMesh(Utils.meshTensors(((10,10),(40,10),(10,10)), ((10,10),(20,10),(0,0)))) + from SimPEG import Mesh, Utils + M = Mesh.TensorMesh(Utils.meshTensors(((10,10),(40,10),(10,10)), ((10,10),(20,10),(0,0)))) M.plotGrid() For a quick tensor mesh on a (10x12x15) unit cube:: - mesh = TensorMesh([10, 12, 15]) + mesh = Mesh.TensorMesh([10, 12, 15]) """ diff --git a/SimPEG/Mesh/TensorView.py b/SimPEG/Mesh/TensorView.py index 7f1cb5e5..7446aecd 100644 --- a/SimPEG/Mesh/TensorView.py +++ b/SimPEG/Mesh/TensorView.py @@ -34,11 +34,22 @@ class TensorView(object): :param str annotationColor: color of annotation, e.g. 'w', 'k', 'b' :param bool showIt: call plt.show() - .. plot:: examples/mesh/plot_image_2D.py - :include-source: + .. plot:: + :include-source: + + from SimPEG import Mesh, np + M = Mesh.TensorMesh([20, 20]) + I = np.sin(M.gridCC[:,0]*2*np.pi)*np.sin(M.gridCC[:,1]*2*np.pi) + M.plotImage(I, showIt=True) + + .. plot:: + :include-source: + + from SimPEG import Mesh, np + M = Mesh.TensorMesh([20,20,20]) + I = np.sin(M.gridCC[:,0]*2*np.pi)*np.sin(M.gridCC[:,1]*2*np.pi)*np.sin(M.gridCC[:,2]*2*np.pi) + M.plotImage(I, annotationColor='k', showIt=True) - .. plot:: examples/mesh/plot_image_3D.py - :include-source: """ assert type(I) == np.ndarray, "I must be a numpy array" assert type(numbering) == bool, "numbering must be a bool" @@ -237,11 +248,25 @@ class TensorView(object): :param bool lines: plot lines connecting nodes :param bool showIt: call plt.show() - .. plot:: examples/mesh/plot_grid_2D.py + .. plot:: :include-source: - .. plot:: examples/mesh/plot_grid_3D.py + from SimPEG import Mesh, np + h1 = np.linspace(.1,.5,3) + h2 = np.linspace(.1,.5,5) + mesh = Mesh.TensorMesh([h1, h2]) + mesh.plotGrid(nodes=True, faces=True, centers=True, lines=True, showIt=True) + + .. plot:: :include-source: + + from SimPEG import Mesh, np + h1 = np.linspace(.1,.5,3) + h2 = np.linspace(.1,.5,5) + h3 = np.linspace(.1,.5,3) + mesh = Mesh.TensorMesh([h1,h2,h3]) + mesh.plotGrid(nodes=True, faces=True, centers=True, lines=True, showIt=True) + """ if self.dim == 1: fig = plt.figure(1) diff --git a/SimPEG/Tests/TestUtils.py b/SimPEG/Tests/TestUtils.py index c5490f90..d84408d4 100644 --- a/SimPEG/Tests/TestUtils.py +++ b/SimPEG/Tests/TestUtils.py @@ -211,12 +211,10 @@ def checkDerivative(fctn, x0, num=7, plotIt=True, dx=None, expectedOrder=2, tole .. plot:: :include-source: - from SimPEG.tests import checkDerivative - from SimPEG.Utils import sdiag - import numpy as np + from SimPEG import Tests, Utils, np def simplePass(x): - return np.sin(x), sdiag(np.cos(x)) - checkDerivative(simplePass, np.random.randn(5)) + return np.sin(x), Utils.sdiag(np.cos(x)) + Tests.checkDerivative(simplePass, np.random.randn(5)) """ print "%s checkDerivative %s" % ('='*20, '='*20) diff --git a/SimPEG/Tests/runTests.py b/SimPEG/Tests/runTests.py deleted file mode 100644 index 58d94303..00000000 --- a/SimPEG/Tests/runTests.py +++ /dev/null @@ -1,57 +0,0 @@ -import os -import glob -import unittest -import HTMLTestRunner - -# This code will run all tests in directory named test_*.py -def main(html=False): - TITLE = 'Test Results' - test_file_strings = glob.glob('test_*.py') - module_strings = [str[0:len(str)-3] for str in test_file_strings] - suites = [unittest.defaultTestLoader.loadTestsFromName(str) for str - in module_strings] - testSuite = unittest.TestSuite(suites) - - if not html: - unittest.TextTestRunner(verbosity=2).run(testSuite) - return - - - outfile = open("report.html", "w") - runner = HTMLTestRunner.HTMLTestRunner( - stream=outfile, - title=TITLE, - description='SimPEG Test Report was automatically generated.', - verbosity=2 - ) - - runner.run(testSuite) - outfile.close() - - reader = open("report.html", "r") - writer = open("../../docs/api_TestResults.rst", "w") - - writer.write('.. _api_TestResults:\n\nTest Results\n============\n\n.. raw:: html\n\n') - - go = False - for line in reader: - skip = False - if line == ' - - - -
-

Start Time: 2013-11-26 20:46:38

-

Duration: 0:00:31.569170

-

Status: Pass 124

- -

SimPEG Test Report was automatically generated.

-
- - - -

Show - Summary - Failed - All -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Test Group/Test caseCountPassFailErrorView
test_basemesh.TestBaseMesh111100Detail
test_meshDimensions
pass
test_mesh_nc
pass
test_mesh_nc_xyz
pass
test_mesh_ne
pass
test_mesh_nf
pass
test_mesh_numbers
pass
test_mesh_r_CC_M
pass
test_mesh_r_E_M
pass
test_mesh_r_E_V
pass
test_mesh_r_F_M
pass
test_mesh_r_F_V
pass
test_basemesh.TestMeshNumbers2D111100Detail
test_meshDimensions
pass
test_mesh_nc
pass
test_mesh_nc_xyz
pass
test_mesh_ne
pass
test_mesh_nf
pass
test_mesh_numbers
pass
test_mesh_r_CC_M
pass
test_mesh_r_E_M
pass
test_mesh_r_E_V
pass
test_mesh_r_F_M
pass
test_mesh_r_F_V
pass
test_forward_DCproblem.DCProblemTests4400Detail
test_adjoint
pass
test_dataObj
 - - - - pass - - - - -
test_misfit
 - - - - pass - - - - -
test_modelObj
 - - - - pass - - - - -
test_forward_problem.ProblemTests2200Detail
test_modelTransform
 - - - - pass - - - - -
test_regularization
 - - - - pass - - - - -
test_interpolation.TestInterpolation1D2200Detail
test_orderCC
 - - - - pass - - - - -
test_orderN
 - - - - pass - - - - -
test_interpolation.TestInterpolation2d6600Detail
test_orderCC
 - - - - pass - - - - -
test_orderEx
 - - - - pass - - - - -
test_orderEy
 - - - - pass - - - - -
test_orderFx
 - - - - pass - - - - -
test_orderFy
 - - - - pass - - - - -
test_orderN
 - - - - pass - - - - -
test_interpolation.TestInterpolation3D8800Detail
test_orderCC
 - - - - pass - - - - -
test_orderEx
 - - - - pass - - - - -
test_orderEy
 - - - - pass - - - - -
test_orderEz
 - - - - pass - - - - -
test_orderFx
 - - - - pass - - - - -
test_orderFy
 - - - - pass - - - - -
test_orderFz
 - - - - pass - - - - -
test_orderN
 - - - - pass - - - - -
test_LogicallyOrthogonalMesh.BasicLOMTests8800Detail
test_area_3D
pass
test_edge_2D
pass
test_edge_3D
pass
test_grid
pass
test_normals
pass
test_tangents
pass
test_vol_2D
pass
test_vol_3D
pass
test_massMatrices.TestInnerProducts: Integrate an function over a unit cube domain using edgeInnerProducts and faceInnerProducts.6600Detail
test_order1_edges
 - - - - pass - - - - -
test_order1_faces
 - - - - pass - - - - -
test_order3_edges
 - - - - pass - - - - -
test_order3_faces
 - - - - pass - - - - -
test_order6_edges
 - - - - pass - - - - -
test_order6_faces
 - - - - pass - - - - -
test_massMatrices.TestInnerProducts2D: Integrate an function over a unit cube domain using edgeInnerProducts and faceInnerProducts.6600Detail
test_order1_edges
 - - - - pass - - - - -
test_order1_faces
 - - - - pass - - - - -
test_order2_faces
 - - - - pass - - - - -
test_order3_edges
 - - - - pass - - - - -
test_order3_faces
 - - - - pass - - - - -
test_order6_edges
 - - - - pass - - - - -
test_operators.TestAveraging2D6600Detail
test_orderCC2F
 - - - - pass - - - - -
test_orderE2CC
 - - - - pass - - - - -
test_orderF2CC
 - - - - pass - - - - -
test_orderN2CC
 - - - - pass - - - - -
test_orderN2E
 - - - - pass - - - - -
test_orderN2F
 - - - - pass - - - - -
test_operators.TestAveraging3D6600Detail
test_orderCC2F
 - - - - pass - - - - -
test_orderE2CC
 - - - - pass - - - - -
test_orderF2CC
 - - - - pass - - - - -
test_orderN2CC
 - - - - pass - - - - -
test_orderN2E
 - - - - pass - - - - -
test_orderN2F
 - - - - pass - - - - -
test_operators.TestCellGrad1D_InhomogeneousDirichlet1100Detail
test_order
 - - - - pass - - - - -
test_operators.TestCellGrad2D_Dirichlet1100Detail
test_order
 - - - - pass - - - - -
test_operators.TestCellGrad2D_Neumann1100Detail
test_order
 - - - - pass - - - - -
test_operators.TestCellGrad3D_Dirichlet1100Detail
test_order
 - - - - pass - - - - -
test_operators.TestCellGrad3D_Neumann1100Detail
test_order
 - - - - pass - - - - -
test_operators.TestCurl1100Detail
test_order
 - - - - pass - - - - -
test_operators.TestFaceDiv2D1100Detail
test_order
 - - - - pass - - - - -
test_operators.TestFaceDiv3D1100Detail
test_order
 - - - - pass - - - - -
test_operators.TestNodalGrad1100Detail
test_order
 - - - - pass - - - - -
test_operators.TestNodalGrad2D1100Detail
test_order
 - - - - pass - - - - -
test_optimizers.TestOptimizers4400Detail
test_GN_Rosenbrock
 - - - - pass - - - - -
test_GN_quadratic
 - - - - pass - - - - -
test_ProjGradient_quadratic1Bound
 - - - - pass - - - - -
test_ProjGradient_quadraticBounded
 - - - - pass - - - - -
test_Solver.TestSolver141400Detail
test_directDiagonal_1
pass
test_directDiagonal_M
pass
test_directFactored_1
pass
test_directFactored_M
pass
test_directLower_1_fortran
pass
test_directLower_1_python
pass
test_directLower_M_fortran
pass
test_directLower_M_python
pass
test_directSpsolve_1
pass
test_directSpsolve_M
pass
test_directUpper_1_fortran
pass
test_directUpper_1_python
pass
test_directUpper_M_fortran
pass
test_directUpper_M_python
pass
test_tensorMesh.BasicTensorMeshTests7700Detail
test_area_3D
pass
test_edge_2D
pass
test_edge_3D
pass
test_vectorCC_2D
pass
test_vectorN_2D
pass
test_vol_2D
pass
test_vol_3D
pass
test_tensorMesh.TestPoissonEqn2200Detail
test_orderBackward
 - - - - pass - - - - -
test_orderForward
 - - - - pass - - - - -
test_utils.TestCheckDerivative3300Detail
test_simpleFail
 - - - - pass - - - - -
test_simpleFunction
 - - - - pass - - - - -
test_simplePass
 - - - - pass - - - - -
test_utils.TestSequenceFunctions8800Detail
test_indexCube_2D
pass
test_indexCube_3D
pass
test_invXXXBlockDiagonal
pass
test_mkvc1
pass
test_mkvc2
pass
test_mkvc3
pass
test_ndgrid_2D
pass
test_ndgrid_3D
pass
Total12412400 
- diff --git a/docs/api_Tests.rst b/docs/api_Tests.rst index 164f5b5d..0ab45c51 100644 --- a/docs/api_Tests.rst +++ b/docs/api_Tests.rst @@ -3,6 +3,6 @@ Testing SimPEG ************** -.. automodule:: SimPEG.tests.TestUtils +.. automodule:: SimPEG.Tests.TestUtils :members: :undoc-members: diff --git a/docs/api_Utils.rst b/docs/api_Utils.rst index 7960b3e1..9c40cabe 100644 --- a/docs/api_Utils.rst +++ b/docs/api_Utils.rst @@ -4,7 +4,7 @@ Solver ****** -.. automodule:: SimPEG.utils.Solver +.. automodule:: SimPEG.Solver :members: :undoc-members: @@ -12,49 +12,49 @@ Solver Utilities ********* -.. automodule:: SimPEG.utils +.. automodule:: SimPEG.Utils :members: :undoc-members: Matrix Utilities **************** -.. automodule:: SimPEG.utils.matutils +.. automodule:: SimPEG.Utils.matutils :members: :undoc-members: Sparse Utilities **************** -.. automodule:: SimPEG.utils.sputils +.. automodule:: SimPEG.Utils.sputils :members: :undoc-members: LOM Utilities ************* -.. automodule:: SimPEG.utils.lomutils +.. automodule:: SimPEG.Utils.lomutils :members: :undoc-members: Mesh Utilities ************** -.. automodule:: SimPEG.utils.meshutils +.. automodule:: SimPEG.Utils.meshutils :members: :undoc-members: Model Builder Utilities *********************** -.. automodule:: SimPEG.utils.ModelBuilder +.. automodule:: SimPEG.Utils.ModelBuilder :members: :undoc-members: Interpolation Utilities *********************** -.. automodule:: SimPEG.utils.interputils +.. automodule:: SimPEG.Utils.interputils :members: :undoc-members: diff --git a/docs/examples/mesh/plot_LogicallyOrthogonalMesh.py b/docs/examples/mesh/plot_LogicallyOrthogonalMesh.py deleted file mode 100644 index bb49ae9a..00000000 --- a/docs/examples/mesh/plot_LogicallyOrthogonalMesh.py +++ /dev/null @@ -1,7 +0,0 @@ -from SimPEG.mesh import LogicallyOrthogonalMesh -from SimPEG import utils -import matplotlib.pyplot as plt -X, Y = utils.exampleLomGird([3,3],'rotate') -M = LogicallyOrthogonalMesh([X, Y]) -M.plotGrid() -plt.show() diff --git a/docs/examples/mesh/plot_grid_2D.py b/docs/examples/mesh/plot_grid_2D.py deleted file mode 100644 index 4c6d5da5..00000000 --- a/docs/examples/mesh/plot_grid_2D.py +++ /dev/null @@ -1,11 +0,0 @@ -import numpy as np -import matplotlib.pyplot as plt -from SimPEG.mesh import TensorMesh - -h1 = np.linspace(.1,.5,3) -h2 = np.linspace(.1,.5,5) -mesh = TensorMesh([h1, h2]) -mesh.plotGrid(nodes=True, faces=True, centers=True, lines=True) - -plt.show() - diff --git a/docs/examples/mesh/plot_grid_3D.py b/docs/examples/mesh/plot_grid_3D.py deleted file mode 100644 index 6278802c..00000000 --- a/docs/examples/mesh/plot_grid_3D.py +++ /dev/null @@ -1,12 +0,0 @@ -import numpy as np -import matplotlib.pyplot as plt -from SimPEG.mesh import TensorMesh - -h1 = np.linspace(.1,.5,3) -h2 = np.linspace(.1,.5,5) -h3 = np.linspace(.1,.5,3) -mesh = TensorMesh([h1,h2,h3]) -mesh.plotGrid(nodes=True, faces=True, centers=True, lines=True) - -plt.show() - diff --git a/docs/examples/mesh/plot_image_2D.py b/docs/examples/mesh/plot_image_2D.py deleted file mode 100644 index 9fef3f1b..00000000 --- a/docs/examples/mesh/plot_image_2D.py +++ /dev/null @@ -1,11 +0,0 @@ -import numpy as np -import matplotlib.pyplot as plt -from SimPEG.mesh import TensorMesh - -n = 20 -h = np.ones(n)/n -M = TensorMesh([h, h]) -I = np.sin(M.gridCC[:,0]*2*np.pi)*np.sin(M.gridCC[:,1]*2*np.pi) -M.plotImage(I) - -plt.show() diff --git a/docs/examples/mesh/plot_image_3D.py b/docs/examples/mesh/plot_image_3D.py deleted file mode 100644 index c67b0d84..00000000 --- a/docs/examples/mesh/plot_image_3D.py +++ /dev/null @@ -1,12 +0,0 @@ -import numpy as np -import matplotlib.pyplot as plt -from SimPEG.mesh import TensorMesh - -n = 20 -h = np.ones(n)/n -M = TensorMesh([h,h,h]) - -I = np.sin(M.gridCC[:,0]*2*np.pi)*np.sin(M.gridCC[:,1]*2*np.pi)*np.sin(M.gridCC[:,2]*2*np.pi) -M.plotImage(I, annotationColor='k') - -plt.show() diff --git a/docs/examples/mesh/plot_nodes.py b/docs/examples/mesh/plot_nodes.py deleted file mode 100644 index ef11b351..00000000 --- a/docs/examples/mesh/plot_nodes.py +++ /dev/null @@ -1,13 +0,0 @@ -import numpy as np -import matplotlib.pyplot as plt -from SimPEG.mesh import TensorMesh - -x0 = np.zeros(2) -h1 = np.linspace(.1,.5,3) -h2 = np.linspace(.1,.5,5) -M = TensorMesh([h1,h2],x0) -M.plotGrid() -plt.hold() -plt.plot(M.gridN[:,0], M.gridN[:,1], 'ks', markersize=10) -plt.show() - diff --git a/docs/index.rst b/docs/index.rst index b2b9806f..62fd3239 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -64,16 +64,16 @@ Build Results ============= * Master Branch -.. image:: https://travis-ci.org/simpeg/simpeg.png?branch=master - :target: https://travis-ci.org/simpeg/simpeg - :alt: Master Branch - :align: center + .. image:: https://travis-ci.org/simpeg/simpeg.png?branch=master + :target: https://travis-ci.org/simpeg/simpeg + :alt: Master Branch + :align: center * Develop Branch -.. image:: https://travis-ci.org/simpeg/simpeg.png?branch=develop - :target: https://travis-ci.org/simpeg/simpeg - :alt: Develop Branch - :align: center + .. image:: https://travis-ci.org/simpeg/simpeg.png?branch=develop + :target: https://travis-ci.org/simpeg/simpeg + :alt: Develop Branch + :align: center Utility Codes