Changeset 4706

Timestamp:

Sep 5, 2007, 5:36:27 PM (17 years ago)

Author:

ole

Message:

Replaced ':' character with '.' as Windows version of netcdf doesn't allow it.

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -351 +351 @@
                     N = len(poly)
                     fid.createDimension('polygon_length', N)
-                    fid.createVariable('extrema:polygon',
+                    fid.createVariable('extrema.polygon',
                                        self.precision,
                                        ('polygon_length',
                                         'two'))
-                    fid.variables['extrema:polygon'][:] = poly                                    
+                    fid.variables['extrema.polygon'][:] = poly                                    
+
                     
                 interval = domain.monitor_time_interval
                 if interval is not None:
-                    fid.createVariable('extrema:time_interval',
+                    fid.createVariable('extrema.time_interval',
                                        self.precision,
                                        ('two',))
-                    fid.variables['extrema:time_interval'][:] = interval
-                    
-                
+                    fid.variables['extrema.time_interval'][:] = interval
 
                 
                 for q in domain.quantities_to_be_monitored:
                     #print 'doing', q
-                    fid.createVariable(q+':extrema', self.precision,
+                    fid.createVariable(q+'.extrema', self.precision,
                                        ('numbers_in_range',))
-                    fid.createVariable(q+':min_location', self.precision,
+                    fid.createVariable(q+'.min_location', self.precision,
                                        ('numbers_in_range',))
-                    fid.createVariable(q+':max_location', self.precision,
+                    fid.createVariable(q+'.max_location', self.precision,
                                        ('numbers_in_range',))
-                    fid.createVariable(q+':min_time', self.precision,
+                    fid.createVariable(q+'.min_time', self.precision,
                                        ('singleton',))
-                    fid.createVariable(q+':max_time', self.precision,
+                    fid.createVariable(q+'.max_time', self.precision,
                                        ('singleton',))
 
@@ -582 +581 @@
 
                     if info['min'] is not None:
-                        fid.variables[q + ':extrema'][0] = info['min']
-                        fid.variables[q + ':min_location'][:] =\
+                        fid.variables[q + '.extrema'][0] = info['min']
+                        fid.variables[q + '.min_location'][:] =\
                                         info['min_location']
-                        fid.variables[q + ':min_time'][0] = info['min_time']
+                        fid.variables[q + '.min_time'][0] = info['min_time']
                         
                     if info['max'] is not None:
-                        fid.variables[q + ':extrema'][1] = info['max']
-                        fid.variables[q + ':max_location'][:] =\
+                        fid.variables[q + '.extrema'][1] = info['max']
+                        fid.variables[q + '.max_location'][:] =\
                                         info['max_location']
-                        fid.variables[q + ':max_time'][0] = info['max_time']
+                        fid.variables[q + '.max_time'][0] = info['max_time']
 
             

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -304 +304 @@
 
         # Get the variables
-        extrema = fid.variables['stage-elevation:extrema'][:]
+        extrema = fid.variables['stage-elevation.extrema'][:]
         assert allclose(extrema, [0.00, 0.30])
 
-        loc = fid.variables['stage-elevation:min_location'][:]
+        loc = fid.variables['stage-elevation.min_location'][:]
         assert allclose(loc, [0.16666667, 0.33333333])
 
-        loc = fid.variables['stage-elevation:max_location'][:]        
+        loc = fid.variables['stage-elevation.max_location'][:]        
         assert allclose(loc, [0.8333333, 0.16666667])        
 
-        time = fid.variables['stage-elevation:max_time'][:]
+        time = fid.variables['stage-elevation.max_time'][:]
         assert allclose(time, 0.0)                
 
-        extrema = fid.variables['xmomentum:extrema'][:]
+        extrema = fid.variables['xmomentum.extrema'][:]
         assert allclose(extrema,[-0.06062178, 0.47886313])
         
-        extrema = fid.variables['ymomentum:extrema'][:]
+        extrema = fid.variables['ymomentum.extrema'][:]
         assert allclose(extrema,[0.00, 0.06241221])        
 
-        time_interval = fid.variables['extrema:time_interval'][:]
+        time_interval = fid.variables['extrema.time_interval'][:]
         assert allclose(time_interval, [0,1])
         
-        polygon = fid.variables['extrema:polygon'][:]        
+        polygon = fid.variables['extrema.polygon'][:]        
         assert allclose(polygon, domain.get_boundary_polygon())