Changeset 4165 for anuga_core/source/anuga/fit_interpolate

Timestamp:

Jan 10, 2007, 4:50:53 PM (18 years ago)

Author:

duncan

Message:

removing read/write of .xya files from loadASCII.py

Location:

anuga_core/source/anuga/fit_interpolate

Files:

• fit.py (modified) (5 diffs)
• test_fit.py (modified) (8 diffs)

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -500 +500 @@
 
 
-def fit_to_mesh_file(mesh_file, point_file, mesh_output_file,
+def obsolete_fit_to_mesh_file(mesh_file, point_file, mesh_output_file,
                      alpha=DEFAULT_ALPHA, verbose= False,
                      display_errors = True):
@@ -516 +516 @@
     
     """
+    #OBSOLETE
+    #Problems with using blocking and knowing the attribute title..
+
 
     # Question
@@ -553 +556 @@
     # load in the .pts file
     try:
-        point_dict = import_points_file(point_file, verbose=verbose)
+        #point_dict = import_points_file(point_file, verbose=verbose)
+        
+        geospatial = Geospatial_data(point_file)
+        point_coordinates = geospatial.get_data_points(absolute=False)
     except IOError,e:
         if display_errors:
@@ -559 +565 @@
         raise IOError  #Re-raise exception  
 
-    point_coordinates = point_dict['pointlist']
-    title_list,point_attributes = concatinate_attributelist(point_dict['attributelist'])
-
-    if point_dict.has_key('geo_reference') and not point_dict['geo_reference'] is None:
-        data_origin = point_dict['geo_reference'].get_origin()
-    else:
-        data_origin = (56, 0, 0) #FIXME(DSG-DSG)
+    #point_coordinates = point_dict['pointlist']
+    #get_all_attributes
+    #title_list,point_attributes = concatinate_attributelist(point_dict['attributelist'])
+    title_list,point_attributes = concatinate_attributelist( \
+        geospatial.get_all_attributes())
+
 
     if mesh_dict.has_key('geo_reference') and not mesh_dict['geo_reference'] is None:
@@ -576 +581 @@
     f = fit_to_mesh(vertex_coordinates,
                     triangles,
-                    point_coordinates,
-                    point_attributes,
+                    point_file,
                     alpha = alpha,
                     verbose = verbose,

anuga_core/source/anuga/fit_interpolate/test_fit.py

@@ -271 +271 @@
         
         f = fit_to_mesh(vertices, triangles,fileName,
-                                alpha=0.0, max_read_lines=2)#, verbose=True)
+                                alpha=0.0, max_read_lines=2)
+                        #use_cache=True, verbose=True)
         answer = linear_function(vertices)
         #print "f\n",f
@@ -604 +605 @@
 
 
-    def test_fit_to_mesh_file(self):
+    def obsolete_test_fit_to_mesh_file(self):
         from load_mesh.loadASCII import import_mesh_file, \
              export_mesh_file
@@ -656 +657 @@
 
 
-    def test_fit_to_mesh_file3(self):
+    def obsolete_test_fit_to_mesh_file3(self):
         from load_mesh.loadASCII import import_mesh_file, \
              export_mesh_file
@@ -708 +709 @@
         os.remove(mesh_output_file)
 
-    def test_fit_to_mesh_file4(self):
+    def obsolete_test_fit_to_mesh_file4(self):
         from load_mesh.loadASCII import import_mesh_file, \
              export_mesh_file
@@ -762 +763 @@
         os.remove(mesh_output_file)
 
-    def test_fit_to_mesh_fileII(self):
+    def obsolete_test_fit_to_mesh_fileII(self):
         from load_mesh.loadASCII import import_mesh_file, \
              export_mesh_file
@@ -813 +814 @@
         os.remove(point_file)
 
-    def test_fit_to_mesh_file_errors(self):
+    def obsolete_test_fit_to_mesh_file_errors(self):
         from load_mesh.loadASCII import import_mesh_file, export_mesh_file
         import tempfile
@@ -851 +852 @@
         os.remove(point_file)
 
-    def test_fit_to_mesh_file_errorsII(self):
+    def obsolete_test_fit_to_mesh_file_errorsII(self):
         from load_mesh.loadASCII import import_mesh_file, export_mesh_file
         import tempfile
@@ -881 +882 @@
         os.remove(point_file)
 
-    def test_fit_to_mesh_file_errorsIII(self):
+    def obsolete_test_fit_to_mesh_file_errorsIII(self):
         from load_mesh.loadASCII import import_mesh_file, export_mesh_file
         import tempfile