Index: ../trunk-jpl/src/m/classes/model.py
===================================================================
--- ../trunk-jpl/src/m/classes/model.py	(revision 17587)
+++ ../trunk-jpl/src/m/classes/model.py	(revision 17588)
@@ -2,7 +2,7 @@
 import numpy
 import copy
 import sys
-from mesh import mesh
+from mesh2d import mesh2d
 from mesh3dprisms import mesh3dprisms
 from mask import mask
 from geometry import geometry
@@ -55,7 +55,7 @@
 class model(object):
 	#properties
 	def __init__(self):#{{{
-		self.mesh             = mesh()
+		self.mesh             = mesh2d()
 		self.mask             = mask()
 		self.geometry         = geometry()
 		self.constants        = constants()
Index: ../trunk-jpl/src/m/parameterization/contourenvelope.py
===================================================================
--- ../trunk-jpl/src/m/parameterization/contourenvelope.py	(revision 17587)
+++ ../trunk-jpl/src/m/parameterization/contourenvelope.py	(revision 17588)
@@ -3,7 +3,8 @@
 import copy
 from NodeConnectivity import NodeConnectivity
 from ElementConnectivity import ElementConnectivity
-from mesh import mesh
+from mesh2d import mesh2d
+from mesh3dprisms import mesh3dprisms
 import MatlabFuncs as m
 
 def contourenvelope(md,*args):