Index: /issm/trunk-jpl/src/m/classes/model.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/model.py	(revision 17587)
+++ /issm/trunk-jpl/src/m/classes/model.py	(revision 17588)
@@ -3,5 +3,5 @@
 import copy
 import sys
-from mesh import mesh
+from mesh2d import mesh2d
 from mesh3dprisms import mesh3dprisms
 from mask import mask
@@ -56,5 +56,5 @@
 	#properties
 	def __init__(self):#{{{
-		self.mesh             = mesh()
+		self.mesh             = mesh2d()
 		self.mask             = mask()
 		self.geometry         = geometry()
Index: /issm/trunk-jpl/src/m/parameterization/contourenvelope.py
===================================================================
--- /issm/trunk-jpl/src/m/parameterization/contourenvelope.py	(revision 17587)
+++ /issm/trunk-jpl/src/m/parameterization/contourenvelope.py	(revision 17588)
@@ -4,5 +4,6 @@
 from NodeConnectivity import NodeConnectivity
 from ElementConnectivity import ElementConnectivity
-from mesh import mesh
+from mesh2d import mesh2d
+from mesh3dprisms import mesh3dprisms
 import MatlabFuncs as m