rename gmshImport.py to gmshMesh.py

git-svn-id: svn+ssh://code.matforge.org/fipy/branches/ticket452@5286 d80e17d7-ff13-0410-a124-85740d801063
usnistgov · Aug 13, 2012 · 738e369 · 738e369
1 parent 8055286
commit 738e369
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 10 deletions.
diff --git a/examples/diffusion/circle.py b/examples/diffusion/circle.py
@@ -50,7 +50,7 @@
 .. _gmsh manual: http://www.geuz.org/gmsh/doc/texinfo/gmsh.html
 
 The mesh created by :term:`Gmsh` is then imported into :term:`FiPy` using the
-:class:`~fipy.meshes.gmshImport.Gmsh2D` object.
+:class:`~fipy.meshes.gmshMesh.Gmsh2D` object.
 
 >>> from fipy import *
 >>> mesh = Gmsh2D('''

diff --git a/examples/diffusion/circleQuad.py b/examples/diffusion/circleQuad.py
@@ -50,7 +50,7 @@
 .. _gmsh manual: http://www.geuz.org/gmsh/doc/texinfo/gmsh.html
 
 The mesh created by :term:`Gmsh` is then imported into :term:`FiPy` using the
-:class:`~fipy.meshes.gmshImporter.Gmsh2D` object.
+:class:`~fipy.meshes.gmshMesh.Gmsh2D` object.
 
 >>> from fipy import *
 >>> mesh = Gmsh2D('''

diff --git a/examples/diffusion/steadyState/mesh20x20/modifiedMeshInput.py b/examples/diffusion/steadyState/mesh20x20/modifiedMeshInput.py
@@ -39,7 +39,8 @@
 
 This input file again solves a 1D diffusion problem as in
 `./examples/diffusion/steadyState/mesh1D/input.py`. The difference
-being that it uses a triangular mesh loaded in using gmshImport.
+being that it uses a triangular mesh loaded in using the
+:class:`~fipy.meshes.gmshMesh.Gmsh2D` object.
 
 The result is again tested in the same way:
 

diff --git a/fipy/meshes/__init__.py b/fipy/meshes/__init__.py
@@ -3,13 +3,13 @@
 from fipy.meshes.periodicGrid2D import *
 from fipy.meshes.skewedGrid2D import *
 from fipy.meshes.tri2D import *
-from fipy.meshes.gmshImport import *
+from fipy.meshes.gmshMesh import *
 
 __all__ = []
 __all__.extend(factoryMeshes.__all__)
 __all__.extend(periodicGrid1D.__all__)
 __all__.extend(periodicGrid2D.__all__)
 __all__.extend(skewedGrid2D.__all__)
 __all__.extend(tri2D.__all__)
-__all__.extend(gmshImport.__all__)
+__all__.extend(gmshMesh.__all__)
 
diff --git a/fipy/meshes/gmshImport.py → fipy/meshes/gmshMesh.py b/fipy/meshes/gmshImport.py → fipy/meshes/gmshMesh.py
@@ -4,7 +4,7 @@
 # ###################################################################
 #  FiPy - a finite volume PDE solver in Python
 #
-#  FILE: "gmshImport.py"
+#  FILE: "gmshMesh.py"
 #
 #  Author: James O'Beirne <james.obeirne@nist.gov>
 #  Author: Alexander Mont <alexander.mont@nist.gov>

diff --git a/fipy/meshes/mesh2D.py b/fipy/meshes/mesh2D.py
@@ -198,7 +198,7 @@ def _extrude(self, mesh, extrudeFunc, layers):
         ## should extrude cnahe self rather than creating a new mesh?
 
         ## the following allows the 2D mesh to be in 3D space, this can be the case for a
-        ## GmshImporter2DIn3DSpace which would then be extruded.
+        ## Gmsh2DIn3DSpace which would then be extruded.
         oldVertices = mesh.vertexCoords
         if oldVertices.shape[0] == 2:
             oldVertices = numerix.resize(oldVertices, (3, len(oldVertices[0])))

diff --git a/fipy/meshes/numMesh/gmshImport.py b/fipy/meshes/numMesh/gmshImport.py
@@ -1,6 +1,6 @@
 
 from fipy.meshes.numMesh.deprecatedWarning import numMeshDeprecated
-from fipy.meshes.gmshImport import *
+from fipy.meshes.gmshMesh import *
 
 numMeshDeprecated()
 

diff --git a/fipy/meshes/test.py b/fipy/meshes/test.py
@@ -47,7 +47,7 @@ def _suite():
         'fipy.meshes.grid2D',
         'fipy.meshes.grid3D',
         'fipy.meshes.tri2D',
-        'fipy.meshes.gmshImport',
+        'fipy.meshes.gmshMesh',
         'fipy.meshes.periodicGrid1D',
         'fipy.meshes.periodicGrid2D',
         'fipy.meshes.uniformGrid1D',

diff --git a/fipy/tests/testClass.py b/fipy/tests/testClass.py
@@ -165,7 +165,7 @@ def printPackageInfo(self):
 
             ## Gmsh version
             try:
-                from fipy.meshes.gmshImport import gmshVersion
+                from fipy.meshes.gmshMesh import gmshVersion
                 gmshversion = gmshVersion()
                 if gmshversion is None:
                     print 'gmsh is not installed'