From 738e369b29288d8d6754ea9bed6fed1026d6ac0e Mon Sep 17 00:00:00 2001
From: "Jonathan E. Guyer" <guyer@nist.gov>
Date: Mon, 13 Aug 2012 13:57:18 +0000
Subject: [PATCH] rename `gmshImport.py` to `gmshMesh.py`

git-svn-id: svn+ssh://code.matforge.org/fipy/branches/ticket452@5286 d80e17d7-ff13-0410-a124-85740d801063
---
 examples/diffusion/circle.py                                  | 2 +-
 examples/diffusion/circleQuad.py                              | 2 +-
 examples/diffusion/steadyState/mesh20x20/modifiedMeshInput.py | 3 ++-
 fipy/meshes/__init__.py                                       | 4 ++--
 fipy/meshes/{gmshImport.py => gmshMesh.py}                    | 2 +-
 fipy/meshes/mesh2D.py                                         | 2 +-
 fipy/meshes/numMesh/gmshImport.py                             | 2 +-
 fipy/meshes/test.py                                           | 2 +-
 fipy/tests/testClass.py                                       | 2 +-
 9 files changed, 11 insertions(+), 10 deletions(-)
 rename fipy/meshes/{gmshImport.py => gmshMesh.py} (99%)

diff --git a/examples/diffusion/circle.py b/examples/diffusion/circle.py
index 9dd0ebd22b..db73a9888d 100755
--- 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
index fb19a308b2..dd221a88bd 100755
--- 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
index 500f38082c..19880e5473 100755
--- 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
index 25d012c7a4..9b639d3c4b 100644
--- a/fipy/meshes/__init__.py
+++ b/fipy/meshes/__init__.py
@@ -3,7 +3,7 @@
 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__)
@@ -11,5 +11,5 @@
 __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 b/fipy/meshes/gmshMesh.py
similarity index 99%
rename from fipy/meshes/gmshImport.py
rename to fipy/meshes/gmshMesh.py
index bbbc5ee80e..4ea38c037b 100755
--- a/fipy/meshes/gmshImport.py
+++ b/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
index a5b2155c44..1b05cc4e23 100644
--- 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
index dfbe16c4a6..aaf5937ee0 100644
--- 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
index 1629481e7a..02e1e8a52e 100755
--- 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
index 28e62ca01d..0bfb512189 100644
--- 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'