Changeset 4652

Timestamp:

Aug 1, 2007, 6:08:12 PM (17 years ago)

Author:

duncan

Message:

changing max points per cell

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/quantity.py (modified) (1 diff)
• fit_interpolate/general_fit_interpolate.py (modified) (1 diff)
• fit_interpolate/ticket178_benchmark.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -755 +755 @@
                   'verbose': verbose}
 
-
-        # FIXME(dsg):Why is this catched? fit_to_mesh handles caching.
-        # Fair enough - I have commented it out 28/6/7 (Ole)
-        #if use_cache is True:
-        #    try:
-        #        from caching import cache
-        #    except:
-        #        msg = 'Caching was requested, but caching module'+\
-        #              'could not be imported'
-        #        raise msg
-        #
-        #    vertex_attributes = cache(fit_to_mesh,
-        #                              args, kwargs,
-        #                              verbose=verbose,
-        #                              compression=False)
-        #else:
-        #    vertex_attributes = apply(fit_to_mesh,
-        #                              args, kwargs)
-
         vertex_attributes = apply(fit_to_mesh,
                                   args, kwargs)        

anuga_core/source/anuga/fit_interpolate/general_fit_interpolate.py

@@ -38 +38 @@
 
 # tests fail if 2 is used
-MAX_VERTICES_PER_CELL = 30
+MAX_VERTICES_PER_CELL = 8
 
 class FitInterpolate:

anuga_core/source/anuga/fit_interpolate/ticket178_benchmark.py

@@ -17 +17 @@
 is_fit_list = [True, False]
 num_of_points_list = [3, 200, 600, 2000, 6000, 10000, 20000] 
-maxArea_list = [ 0.008, 0.0016, 0.0008]
+#maxArea_list = [ 0.008, 0.0016, 0.0008]
 max_points_per_cell_list = [2,4,8,16,30,64]
 use_file_type_list = ['pts'] #'pts'
 #num_of_points_list = [10]
-maxArea_list = [ 0.008]
-max_points_per_cell_list = [30]
+maxArea_list = [ 0.008, 0.0016]
+max_points_per_cell_list = [4]
 
 fd = open(ofile,'a')