Changeset 4699

Timestamp:

Sep 4, 2007, 1:48:06 PM (17 years ago)

Author:

ole

Message:

Cosmetics while pondering over storage of extrema

Location:

anuga_core/source/anuga

Files:

• config.py (modified) (1 diff)
• shallow_water/data_manager.py (modified) (7 diffs)
• shallow_water/test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/config.py

@@ -149 +149 @@
 umask = 002  # used to set file and directory permission created by anuga
 
+max_float = 1.0e36 # Largest number. Used to initialise (max, min) ranges.
+    

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -87 +87 @@
      ensure_absolute
 from anuga.config import minimum_storable_height as default_minimum_storable_height
+from anuga.config import max_float
 from anuga.utilities.numerical_tools import ensure_numeric,  mean
 from anuga.caching.caching import myhash
@@ -4780 +4781 @@
     sww_quantities = Domain.conserved_quantities
     RANGE = '_range'
+
     def __init__(self):
         pass
@@ -4798 +4800 @@
         outfile.description = description
 
-        #For sww compatibility
+        # For sww compatibility
         if smoothing is True:
             # Smoothing to be depreciated
@@ -4813 +4815 @@
         except:
             revision_number = None
-        # writing a string so None can be written    
-        outfile.revision_number = str(revision_number)
-        #times - A list or array of the time slice times OR a start time
-        #times = ensure_numeric(times) 
-        #Start time in seconds since the epoch (midnight 1/1/1970)
-
-        # this is being used to seperate one number from a list.
+        # Allow None to be stored as a string                
+        outfile.revision_number = str(revision_number) 
+
+
+        
+        # times - A list or array of the time slice times OR a start time
+        # times = ensure_numeric(times) 
+        # Start time in seconds since the epoch (midnight 1/1/1970)
+
+        # This is being used to seperate one number from a list.
         # what it is actually doing is sorting lists from numeric arrays.
         if type(times) is list or type(times) is ArrayType:  
@@ -4857 +4862 @@
         outfile.createVariable(q+Write_sww.RANGE, precision,
                                ('numbers_in_range',))
-        # The values are initally filled with large (10e+36) numbers.
-        # I'm relying on this feature.  Maybe I shouldn't?
-        outfile.variables[q+Write_sww.RANGE][1] = \
-                          -1*outfile.variables[q+Write_sww.RANGE][1]
+
+        # 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
@@ -4878 +4884 @@
             outfile.createVariable(q+Write_sww.RANGE, precision,
                                    ('numbers_in_range',))
-            # Initialising the max value to a very small number.
-            # It assumes that netcdf initialises it to a very large number
-            outfile.variables[q+Write_sww.RANGE][1] = \
-                -outfile.variables[q+Write_sww.RANGE][1]
+
+            # 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
             
         if type(times) is list or type(times) is ArrayType:  
@@ -5038 +5045 @@
         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 '  %s in [%f, %f]' %(q,
+                                       outfile.variables[q+Write_sww.RANGE][0],
+                                       outfile.variables[q+Write_sww.RANGE][1])
         print '------------------------------------------------'
+
         
 def obsolete_write_sww_time_slices(outfile, has, uas, vas, elevation,

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -262 +262 @@
         #print "sww.filename", sww.filename
         os.remove(sww.filename)
+
+        
         
     def test_sww_constant_smooth(self):