Changeset 7346

Timestamp:

Aug 9, 2009, 5:34:33 PM (14 years ago)

Author:

ole

Message:

Verified that variable elevation can be stored as a time dependent quantity.
Also, ensured backwards compatibility with old viewer.

Location:

anuga_core

Files:

• documentation/user_manual/demos/channel_variable.py (modified) (1 diff)
• source/anuga/shallow_water/data_manager.py (modified) (2 diffs)

anuga_core/documentation/user_manual/demos/channel_variable.py

@@ -23 +23 @@
                                                len1=length, len2=width)
 domain = Domain(points, vertices, boundary)
-domain.set_name('channel3')                  # Output name
+domain.set_name('channel_variable')                  # Output name
 print domain.statistics()
+domain.set_quantities_to_be_stored({'elevation': 1, #2,
+                                    'stage': 2})
 
 #------------------------------------------------------------------------------

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -6003 +6003 @@
             outfile.variables[q+Write_sww.RANGE][1] = -max_float # Max
 
-        # FIXME: Backwards compat - get rid of z once old view has retired
-        outfile.createVariable('z', sww_precision,
-                               ('number_of_points',))
+        if 'elevation' in self.static_quantities:    
+            # FIXME: Backwards compat - get rid of z once old view has retired
+            outfile.createVariable('z', sww_precision,
+                                   ('number_of_points',))
                                
         for q in self.dynamic_quantities:
@@ -6167 +6168 @@
                 # This populates the _range values
                 outfile.variables[q + Write_sww.RANGE][0] = num.min(x)
-                outfile.variables[q + Write_sww.RANGE][1] = num.max(x)                
+                outfile.variables[q + Write_sww.RANGE][1] = num.max(x)
                     
-        outfile.variables['z'][:] = outfile.variables['elevation'][:] #FIXME HACK
+        # FIXME: Hack for backwards compatibility with old viewer
+        if 'elevation' in self.static_quantities:
+            outfile.variables['z'][:] = outfile.variables['elevation'][:]