Changeset 9253

Timestamp:

Jul 8, 2014, 1:09:38 PM (11 years ago)

Author:

davies

Message:

Occasional changes to getting netcdf variables [to allow gareth's windows machine to pass test_all]

Location:

trunk/anuga_core/source/anuga

Files:

• file/sww.py (modified) (7 diffs)
• file_conversion/sww2dem.py (modified) (1 diff)
• shallow_water/sww_interrogate.py (modified) (1 diff)

trunk/anuga_core/source/anuga/file/sww.py

@@ -266 +266 @@
 
         # Check to see if the file is already too big:
-        time = fid.variables['time']
+        time = fid.variables['time'][:]
 
         i = len(time) + 1
@@ -318 +318 @@
 
             # Get the variables
-            time = fid.variables['time']
+            time = fid.variables['time'][:]
             i = len(time)
              
@@ -422 +422 @@
         fin = NetCDFFile(self.source, 'r')
 
-        self.time = num.array(fin.variables['time'], num.float)
+        self.time = num.array(fin.variables['time'][:], num.float)
         self.last_frame_number = self.time.shape[0] - 1
 
@@ -441 +441 @@
         fin = NetCDFFile(self.source, 'r')
 
-        self.vertices = num.array(fin.variables['volumes'], num.int)
-        
-        self.x = x = num.array(fin.variables['x'], num.float)
-        self.y = y = num.array(fin.variables['y'], num.float)
+        self.vertices = num.array(fin.variables['volumes'][:], num.int)
+        
+        self.x = x = num.array(fin.variables['x'][:], num.float)
+        self.y = y = num.array(fin.variables['y'][:], num.float)
 
         assert len(self.x) == len(self.y)
@@ -474 +474 @@
             #print q
             if len(fin.variables[q].shape) == 1: # Not a time-varying quantity
-                self.quantities[q] = num.ravel(num.array(fin.variables[q], num.float)).reshape(M,3)
+                self.quantities[q] = num.ravel(num.array(fin.variables[q][:], num.float)).reshape(M,3)
             else: # Time-varying, get the current timestep data
                 self.quantities[q] = num.array(fin.variables[q][self.frame_number], num.float).reshape(M,3)
@@ -1127 +1127 @@
 
     fid = NetCDFFile(filename, netcdf_mode_r)    # Open existing file for read
-    time = fid.variables['time']       # Timesteps
+    time = fid.variables['time'][:]       # Timesteps
     if t is None:
         t = time[-1]
@@ -1337 +1337 @@
     # Mesh (nodes (Mx2), triangles (Nx3))
     nodes = num.concatenate((x[:,num.newaxis], y[:,num.newaxis]), axis=1)
-    triangles = fid.variables['volumes']
+    triangles = fid.variables['volumes'][:]
 
     # Get geo_reference

trunk/anuga_core/source/anuga/file_conversion/sww2dem.py

@@ -135 +135 @@
 
     #Get extent and reference
-    x = num.array(fid.variables['x'], num.float)
-    y = num.array(fid.variables['y'], num.float)
-    volumes = num.array(fid.variables['volumes'], num.int)
+    x = num.array(fid.variables['x'][:], num.float)
+    y = num.array(fid.variables['y'][:], num.float)
+    volumes = num.array(fid.variables['volumes'][:], num.int)
     if type(reduction) is not types.BuiltinFunctionType:
         times = fid.variables['time'][reduction]

trunk/anuga_core/source/anuga/shallow_water/sww_interrogate.py

@@ -511 +511 @@
 
         # Get the relevant quantities (Convert from single precison)
-        elevation = num.array(fid.variables['elevation'], num.float)
-        stage = num.array(fid.variables['stage'], num.float)
+        elevation = num.array(fid.variables['elevation'][:], num.float)
+        stage = num.array(fid.variables['stage'][:], num.float)
 
         if verbose: