Changeset 4252

Timestamp:

Feb 9, 2007, 4:49:27 PM (17 years ago)

Author:

duncan

Message:

working on the verbose when using blocking

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py (modified) (3 diffs)
• anuga_core/source/anuga/abstract_2d_finite_volumes/test_quantity.py (modified) (5 diffs)
• anuga_core/source/anuga/fit_interpolate/fit.py (modified) (1 diff)
• anuga_core/source/anuga/geospatial_data/geospatial_data.py (modified) (2 diffs)
• anuga_core/source/anuga/geospatial_data/test_geospatial_data.py (modified) (1 diff)
• anuga_validation/automated_validation_tests/okushiri_tank_validation/loading_pts_test.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -717 +717 @@
                              location, indices,
                              verbose = False,
-                             use_cache = False):
+                             use_cache = False,
+                             max_read_lines=None):
         """Set quantity based on arbitrary points in a points file
         using attribute_name selects name of attribute
@@ -747 +748 @@
                                        'attribute_name': attribute_name,
                                        'use_cache': False,
-                                       'verbose': verbose},
+                                       'verbose': verbose,
+                                       'max_read_lines':max_read_lines},
                                       verbose=verbose)
         else:
@@ -754 +756 @@
                                             attribute_name=attribute_name,
                                             use_cache=use_cache,
-                                            verbose=verbose)
+                                            verbose=verbose,
+                                             max_read_lines=max_read_lines)
             
                                 

anuga_core/source/anuga/abstract_2d_finite_volumes/test_quantity.py

@@ -652 +652 @@
         import os
         os.remove(txt_file)
-          
-    def test_set_values_from_UTM(self):
+         
+    def test_set_values_from_lat_long(self):
+        quantity = Quantity(self.mesh_onslow)
+
+        #Get (enough) datapoints
+        data_points = [[-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6]]
+
+        data_geo_spatial = Geospatial_data(data_points,
+                                           points_are_lats_longs=True)
+        points_UTM = data_geo_spatial.get_data_points(absolute=True)
+        attributes = linear_function(points_UTM)
+        att = 'elevation'
+        
+        #Create .txt file
+        txt_file = tempfile.mktemp(".txt")
+        file = open(txt_file,"w")
+        file.write(" lat,long," + att + " \n")
+        for data_point, attribute in map(None, data_points, attributes):
+            row = str(data_point[0]) + ',' + str(data_point[1]) \
+                  + ',' + str(attribute)
+            #print "row", row 
+            file.write(row + "\n")
+        file.close()
+
+
+        #Check that values can be set from file
+        quantity.set_values(filename = txt_file,
+                            attribute_name = att, alpha = 0)
+        answer = linear_function(quantity.domain.get_vertex_coordinates())
+
+        #print "quantity.vertex_values.flat", quantity.vertex_values.flat
+        #print "answer",answer
+
+        assert allclose(quantity.vertex_values.flat, answer)
+
+
+        #Check that values can be set from file using default attribute
+        quantity.set_values(filename = txt_file, alpha = 0)
+        assert allclose(quantity.vertex_values.flat, answer)
+
+        #Cleanup
+        import os
+        os.remove(txt_file)
+        
+    def test_set_values_from_UTM_pts(self):
         quantity = Quantity(self.mesh_onslow)
 
@@ -678 +722 @@
 
 
+        pts_file = tempfile.mktemp(".pts")        
+        convert = Geospatial_data(txt_file)
+        convert.export_points_file(pts_file)
+
         #Check that values can be set from file
-        quantity.set_values_from_file(txt_file, att, 0,
+        quantity.set_values_from_file(pts_file, att, 0,
                                       'vertices', None)
         answer = linear_function(quantity.domain.get_vertex_coordinates())
@@ -687 +735 @@
 
         #Check that values can be set from file
-        quantity.set_values(filename = txt_file,
+        quantity.set_values(filename = pts_file,
                             attribute_name = att, alpha = 0)
         answer = linear_function(quantity.domain.get_vertex_coordinates())
@@ -702 +750 @@
         import os
         os.remove(txt_file)
+        os.remove(pts_file)
+        
+    def verbose_test_set_values_from_UTM_pts(self):
+        quantity = Quantity(self.mesh_onslow)
+
+        #Get (enough) datapoints
+        data_points = [[-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       [-21.5, 114.5],[-21.4, 114.6],[-21.45,114.65],
+                       [-21.35, 114.65],[-21.45, 114.55],[-21.45,114.6],
+                       ]
+
+        data_geo_spatial = Geospatial_data(data_points,
+                                           points_are_lats_longs=True)
+        points_UTM = data_geo_spatial.get_data_points(absolute=True)
+        attributes = linear_function(points_UTM)
+        att = 'elevation'
+        
+        #Create .txt file
+        txt_file = tempfile.mktemp(".txt")
+        file = open(txt_file,"w")
+        file.write(" x,y," + att + " \n")
+        for data_point, attribute in map(None, points_UTM, attributes):
+            row = str(data_point[0]) + ',' + str(data_point[1]) \
+                  + ',' + str(attribute)
+            #print "row", row 
+            file.write(row + "\n")
+        file.close()
+
+
+        pts_file = tempfile.mktemp(".pts")        
+        convert = Geospatial_data(txt_file)
+        convert.export_points_file(pts_file)
+
+        #Check that values can be set from file
+        quantity.set_values_from_file(pts_file, att, 0,
+                                      'vertices', None, verbose = True,
+                                      max_read_lines=2)
+        answer = linear_function(quantity.domain.get_vertex_coordinates())
+        #print "quantity.vertex_values.flat", quantity.vertex_values.flat
+        #print "answer",answer
+        assert allclose(quantity.vertex_values.flat, answer)
+
+        #Check that values can be set from file
+        quantity.set_values(filename = pts_file,
+                            attribute_name = att, alpha = 0)
+        answer = linear_function(quantity.domain.get_vertex_coordinates())
+        #print "quantity.vertex_values.flat", quantity.vertex_values.flat
+        #print "answer",answer
+        assert allclose(quantity.vertex_values.flat, answer)
+
+
+        #Check that values can be set from file using default attribute
+        quantity.set_values(filename = txt_file, alpha = 0)
+        assert allclose(quantity.vertex_values.flat, answer)
+
+        #Cleanup
+        import os
+        os.remove(txt_file)
+        os.remove(pts_file)
         
     def test_set_values_from_file_with_georef1(self):
@@ -1870 +2001 @@
     #suite = unittest.makeSuite(Test_Quantity, 'test_set_values_from_UTM')
     #print "restricted test"
-    #suite = unittest.makeSuite(Test_Quantity,'test_set_values_from_file_with_georef2')
+    #suite = unittest.makeSuite(Test_Quantity,'verbose_test_set_values_from_UTM_pts')
     runner = unittest.TextTestRunner()
     runner.run(suite)

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -329 +329 @@
                                               verbose=verbose)):
                 if verbose is True and 0 == i%200: # round every 5 minutes
+                    # But this is dependant on the # of Triangles, so it
+                    #isn't every 5 minutes.
                     print 'Block %i' %i
                 # build the array

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -724 +724 @@
                      _read_pts_file_header(self.fid, self.verbose)
             self.start_row=0
+            self.show_verbose = 0
+            self.verbose_block_size =  (self.last_row +10) /10
         else:
             file_pointer = open(self.file_name)
@@ -761 +763 @@
                 fin_row = self.last_row
 
-            if self.verbose is True and \
-                   0==self.start_row%(( self.last_row+10)/10)==0:
+                
+            
+            if self.verbose is True:
+                if self.show_verbose >= self.start_row and \
+                                       self.show_verbose < fin_row:
                  print 'Doing %d of %d' %(self.start_row, self.last_row+10)
+                 self.show_verbose += max(self.max_read_lines,
+                                          self.verbose_block_size)
             #call stuff
             pointlist, att_dict, = \

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -1050 +1050 @@
         
     def test_load_pts_blocking(self):
-        """ test_load_csv(self):
-        space delimited
-        """
+        #This is pts!
+       
         import os
        

anuga_validation/automated_validation_tests/okushiri_tank_validation/loading_pts_test.py

@@ -48 +48 @@
 t0 = time.time()
 bathymetry_filename=project.bathymetry_filename
+bathymetry_filename='Benchmark_2_Bathymetry_very_thin.pts'
 print 'Starting domain.set_quantity.  Loading ', bathymetry_filename
 s = "domain.set_quantity('elevation',filename=bathymetry_filename,alpha=0.02,verbose=True,use_cache=False)"