source: issm/oecreview/Archive/16554-17801/ISSM-17587-17588.diff@ 17802

../trunk-jpl/src/m/classes/model.py

@@ -2 +2 @@
 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 +55 @@
 class model(object):
         #properties
         def __init__(self):#{{{
-                self.mesh             = mesh()
+                self.mesh             = mesh2d()
                 self.mask             = mask()
                 self.geometry         = geometry()
                 self.constants        = constants()

../trunk-jpl/src/m/parameterization/contourenvelope.py

@@ -3 +3 @@
 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):