Changeset 4182

Timestamp:

Jan 19, 2007, 2:28:26 PM (17 years ago)

Author:

duncan

Message:

fixing import problems

File:

• anuga_core/source/anuga/pmesh/mesh.py (modified) (7 diffs)

anuga_core/source/anuga/pmesh/mesh.py

@@ -26 +26 @@
 
  
-import load_mesh
+#import load_mesh
 from anuga.coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE
 from anuga.utilities.polygon import point_in_polygon 
-import anuga.load_mesh.loadASCII
+from  anuga.load_mesh.loadASCII import NOMAXAREA, export_mesh_file, \
+     import_mesh_file 
 import anuga.alpha_shape.alpha_shape
 from anuga.geospatial_data.geospatial_data import Geospatial_data, \
      ensure_geospatial, ensure_absolute, ensure_numeric
 from anuga.mesh_engine.mesh_engine import generate_mesh
-
-
-#import anuga.mesh_engine_b.mesh_engine as triang
 
 try:  
@@ -1999 +1997 @@
             verts[seg.vertices[1]] = seg.vertices[1]
         meshDict = self.Mesh2IOOutlineDict(userVertices=verts.values())
-        load_mesh.loadASCII.export_mesh_file(ofile,meshDict)
+        export_mesh_file(ofile,meshDict)
         
         # exportASCIImeshfile   - this function is used
@@ -2008 +2006 @@
         
         dict = self.Mesh2IODict()
-        load_mesh.loadASCII.export_mesh_file(ofile,dict)
+        export_mesh_file(ofile,dict)
 
     # FIXME(DSG-DSG):Break this into two functions.
@@ -2176 +2174 @@
         Used to produce .tsh file and output to triangle
         """
+        
         if userVertices is None:
             userVertices = self.getUserVertices()
@@ -2223 +2222 @@
                 regionmaxarealist.append(region.getMaxArea())
             else:
-                regionmaxarealist.append( load_mesh.loadASCII.NOMAXAREA)
+                regionmaxarealist.append(NOMAXAREA)
         meshDict['regions'] = regionlist
         meshDict['region_tags'] = regiontaglist
@@ -3005 +3004 @@
     if (ofile[-4:]== ".xya" or ofile[-4:]== ".pts" or ofile[-4:]== ".txt" or \
         ofile[-4:]== ".csv"):
-        #dict = load_mesh.loadASCII.import_points_file(ofile)
         geospatial = Geospatial_data(ofile)
         dict = {}
@@ -3021 +3019 @@
             print "%i duplicate vertices removed from dataset" % (counter)
     elif (ofile[-4:]== ".tsh" or ofile[-4:]== ".msh"):
-        dict = load_mesh.loadASCII.import_mesh_file(ofile)
+        dict = import_mesh_file(ofile)
         #print "********"
         #print "zq mesh.dict",dict