Changeset 6215

Timestamp:

Jan 19, 2009, 5:39:55 PM (16 years ago)

Author:

ole

Message:

Removed references to _range in sww files in preparation for new viewer and ticket:192
Current extrema still needs to be removed and replaced by vertex based extrema.

Location:

anuga_core/source/anuga

Files:

• shallow_water/data_manager.py (modified) (7 diffs)
• shallow_water/test_data_manager.py (modified) (2 diffs)
• test_all.py (modified) (4 diffs)
• utilities/test_polygon.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -3516 +3516 @@
     other_quantities.remove('z')
     other_quantities.remove('volumes')
-    try:
-        other_quantities.remove('stage_range')
-        other_quantities.remove('xmomentum_range')
-        other_quantities.remove('ymomentum_range')
-        other_quantities.remove('elevation_range')
-    except:
-        pass
+    #try:
+    #    other_quantities.remove('stage_range')
+    #    other_quantities.remove('xmomentum_range')
+    #    other_quantities.remove('ymomentum_range')
+    #    other_quantities.remove('elevation_range')
+    #except:
+    #    pass
 
     conserved_quantities.remove('time')
@@ -5283 +5283 @@
         j += 1
 
-    if verbose: sww.verbose_quantities(outfile)
+    #if verbose: sww.verbose_quantities(outfile)
 
     outfile.close()
@@ -5873 +5873 @@
                                ('number_of_points',))
         q = 'elevation'
-        outfile.createVariable(q + Write_sww.RANGE, sww_precision,
-                               ('numbers_in_range',))
-
-
-        # Initialise ranges with small and large sentinels.
-        # If this was in pure Python we could have used None sensibly
-        outfile.variables[q+Write_sww.RANGE][0] = max_float  # Min
-        outfile.variables[q+Write_sww.RANGE][1] = -max_float # Max
+        #outfile.createVariable(q + Write_sww.RANGE, sww_precision,
+        #                       ('numbers_in_range',))
+
+
+        ## Initialise ranges with small and large sentinels.
+        ## If this was in pure Python we could have used None sensibly
+        #outfile.variables[q+Write_sww.RANGE][0] = max_float  # Min
+        #outfile.variables[q+Write_sww.RANGE][1] = -max_float # Max
 
         # FIXME: Backwards compatibility
@@ -5895 +5895 @@
             outfile.createVariable(q, sww_precision, ('number_of_timesteps',
                                                       'number_of_points'))
-            outfile.createVariable(q + Write_sww.RANGE, sww_precision,
-                                   ('numbers_in_range',))
+            #outfile.createVariable(q + Write_sww.RANGE, sww_precision,
+            #                       ('numbers_in_range',))
 
             # Initialise ranges with small and large sentinels.
             # If this was in pure Python we could have used None sensibly
-            outfile.variables[q+Write_sww.RANGE][0] = max_float  # Min
-            outfile.variables[q+Write_sww.RANGE][1] = -max_float # Max
+            #outfile.variables[q+Write_sww.RANGE][0] = max_float  # Min
+            #outfile.variables[q+Write_sww.RANGE][1] = -max_float # Max
 
         if type(times) is list or type(times) is num.ArrayType:
@@ -6010 +6010 @@
         q = 'elevation'
         # This updates the _range values
-        outfile.variables[q + Write_sww.RANGE][0] = min(elevation)
-        outfile.variables[q + Write_sww.RANGE][1] = max(elevation)
+        #outfile.variables[q + Write_sww.RANGE][0] = min(elevation)
+        #outfile.variables[q + Write_sww.RANGE][1] = max(elevation)
 
 
@@ -6062 +6062 @@
                 outfile.variables[q][slice_index] = \
                                 q_values.astype(sww_precision)
-
-                # This updates the _range values
-                q_range = outfile.variables[q + Write_sww.RANGE][:]
-                q_values_min = min(q_values)
-                if q_values_min < q_range[0]:
-                    outfile.variables[q + Write_sww.RANGE][0] = q_values_min
-                q_values_max = max(q_values)
-                if q_values_max > q_range[1]:
-                    outfile.variables[q + Write_sww.RANGE][1] = q_values_max
+        
+        #        # This updates the _range values
+        #        q_range = outfile.variables[q + Write_sww.RANGE][:]
+        #        q_values_min = min(q_values)
+        #        if q_values_min < q_range[0]:
+        #            outfile.variables[q + Write_sww.RANGE][0] = q_values_min
+        #        q_values_max = max(q_values)
+        #        if q_values_max > q_range[1]:
+        #            outfile.variables[q + Write_sww.RANGE][1] = q_values_max
 
     ##
     # @brief Print the quantities in the underlying file.
     # @param outfile UNUSED.
-    def verbose_quantities(self, outfile):
-        print '------------------------------------------------'
-        print 'More Statistics:'
-        for q in Write_sww.sww_quantities:
-            print '  %s in [%f, %f]' % (q,
-                                        outfile.variables[q+Write_sww.RANGE][0],
-                                        outfile.variables[q+Write_sww.RANGE][1])
-        print '------------------------------------------------'
+    #def verbose_quantities(self, outfile):
+    #    print '------------------------------------------------'
+    #    print 'More Statistics:'
+    #    for q in Write_sww.sww_quantities:
+    #        print '  %s in [%f, %f]' % (q,
+    #                                    outfile.variables[q+Write_sww.RANGE][0],
+    #                                    outfile.variables[q+Write_sww.RANGE][1])
+    #    print '------------------------------------------------'
 
 
@@ -6433 +6433 @@
 
                 # This updates the _range values
-                q_range = outfile.variables[q + Write_sts.RANGE][:]
-                q_values_min = min(q_values)
-                if q_values_min < q_range[0]:
-                    outfile.variables[q + Write_sts.RANGE][0] = q_values_min
-                q_values_max = max(q_values)
-                if q_values_max > q_range[1]:
-                    outfile.variables[q + Write_sts.RANGE][1] = q_values_max
+                #q_range = outfile.variables[q + Write_sts.RANGE][:]
+                #q_values_min = min(q_values)
+                #if q_values_min < q_range[0]:
+                #    outfile.variables[q + Write_sts.RANGE][0] = q_values_min
+                #q_values_max = max(q_values)
+                #if q_values_max > q_range[1]:
+                #    outfile.variables[q + Write_sts.RANGE][1] = q_values_max
 
 

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -251 +251 @@
 
         # Get the variables
-        range = fid.variables['stage_range'][:]
+        #range = fid.variables['stage_range'][:]
         #print range
-        assert num.allclose(range,[-0.93519, 0.15]) or\
-               num.allclose(range,[-0.9352743, 0.15]) or\
-               num.allclose(range,[-0.93522203, 0.15000001]) # Old slope limiters
-        
-        range = fid.variables['xmomentum_range'][:]
-        #print range
-        assert num.allclose(range,[0,0.4695096]) or \
-               num.allclose(range,[0,0.47790655]) or\
-               num.allclose(range,[0,0.46941957]) or\
-               num.allclose(range,[0,0.47769409])
-
-        
-        range = fid.variables['ymomentum_range'][:]
-        #print range
-        assert num.allclose(range,[0,0.02174380]) or\
-               num.allclose(range,[0,0.02174439]) or\
-               num.allclose(range,[0,0.02283983]) or\
-               num.allclose(range,[0,0.0217342]) or\
-               num.allclose(range,[0,0.0227564]) # Old slope limiters 
+        #assert num.allclose(range,[-0.93519, 0.15]) or\
+        #       num.allclose(range,[-0.9352743, 0.15]) or\
+        #       num.allclose(range,[-0.93522203, 0.15000001]) # Old slope limiters
+        
+        #range = fid.variables['xmomentum_range'][:]
+        ##print range
+        #assert num.allclose(range,[0,0.4695096]) or \
+        #       num.allclose(range,[0,0.47790655]) or\
+        #       num.allclose(range,[0,0.46941957]) or\
+        #       num.allclose(range,[0,0.47769409])
+
+        
+        #range = fid.variables['ymomentum_range'][:]
+        ##print range
+        #assert num.allclose(range,[0,0.02174380]) or\
+        #       num.allclose(range,[0,0.02174439]) or\
+        #       num.allclose(range,[0,0.02283983]) or\
+        #       num.allclose(range,[0,0.0217342]) or\
+        #       num.allclose(range,[0,0.0227564]) # Old slope limiters 
         
         fid.close()
@@ -11251 +11251 @@
 if __name__ == "__main__":
 
-    #suite = unittest.makeSuite(Test_Data_Manager,'test')
-    suite = unittest.makeSuite(Test_Data_Manager,'test_file_boundary_sts')
+    suite = unittest.makeSuite(Test_Data_Manager,'test')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_file_boundary_sts')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_get_flow_through_cross_section_with_geo')
     #suite = unittest.makeSuite(Test_Data_Manager,'covered_')

anuga_core/source/anuga/test_all.py

@@ -29 +29 @@
 exclude_dirs = ['pypar_dist',                        #Special requirements
                 'props', 'wcprops', 'prop-base', 'text-base', '.svn', #Svn
-                'tmp']
+                'tmp', 'lib']
 
 print "The following directories will be skipped over;"
@@ -84 +84 @@
     print 'Testing path %s:' %('...'+path[-50:])
     print
+    print 'Paths searched:'
+    for path_file in path_files:
+        print path_file + ',', 
+    print
+    print    
     print 'Files tested;'
     for file in files:
@@ -89 +94 @@
     print
     print
+    print
+
     if globals().has_key('exclude_files'):
         for file in exclude_files:
@@ -103 +110 @@
     moduleNames = map(filenameToModuleName, files)
     modules = map(__import__, moduleNames)
+    
 
     # Fix up the system path

anuga_core/source/anuga/utilities/test_polygon.py

@@ -1783 +1783 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_Polygon,'test')
-#    suite = unittest.makeSuite(Test_Polygon,'test_intersection_bug_20081111')
     runner = unittest.TextTestRunner()
     runner.run(suite)