Changeset 6171

Timestamp:

Jan 14, 2009, 4:43:43 PM (16 years ago)

Author:

ole

Message:

Removed use of 'num' as a variable

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• test_util.py (modified) (6 diffs)
• util.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py

@@ -186 +186 @@
         d_uh = num.reshape(num.take(xmomentum[last_time_index, :], [0,5,10,15]), (4,1))
         d_vh = num.reshape(num.take(ymomentum[last_time_index, :], [0,5,10,15]), (4,1))
-        D = num.concatenate( (d_stage, d_uh, d_vh), axis=1)
+        D = num.concatenate((d_stage, d_uh, d_vh), axis=1)
 
         #Reference interpolated values at midpoints on diagonal at
@@ -222 +222 @@
         d_uh = num.reshape(num.take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
         d_vh = num.reshape(num.take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
-        D = num.concatenate( (d_stage, d_uh, d_vh), axis=1)
+        D = num.concatenate((d_stage, d_uh, d_vh), axis=1)
 
         #Reference interpolated values at midpoints on diagonal at
@@ -244 +244 @@
         d_uh = num.reshape(num.take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
         d_vh = num.reshape(num.take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
-        D = num.concatenate( (d_stage, d_uh, d_vh), axis=1)
+        D = num.concatenate((d_stage, d_uh, d_vh), axis=1)
 
         #Reference interpolated values at midpoints on diagonal at
@@ -265 +265 @@
         d_uh = num.reshape(num.take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
         d_vh = num.reshape(num.take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
-        D = num.concatenate( (d_stage, d_uh, d_vh), axis=1)
+        D = num.concatenate((d_stage, d_uh, d_vh), axis=1)
 
         #Reference interpolated values at midpoints on diagonal at
@@ -278 +278 @@
         d_uh = num.reshape(num.take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
         d_vh = num.reshape(num.take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
-        D = num.concatenate( (d_stage, d_uh, d_vh), axis=1)
+        D = num.concatenate((d_stage, d_uh, d_vh), axis=1)
 
         #Reference interpolated values at midpoints on diagonal at
@@ -389 +389 @@
         d_uh = num.reshape(num.take(xmomentum[last_time_index, :], [0,5,10,15]), (4,1))
         d_vh = num.reshape(num.take(ymomentum[last_time_index, :], [0,5,10,15]), (4,1))
-        D = num.concatenate( (d_stage, d_uh, d_vh), axis=1)
+        D = num.concatenate((d_stage, d_uh, d_vh), axis=1)
 
         #Reference interpolated values at midpoints on diagonal at

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -2215 +2215 @@
             for k, quantity in enumerate(quantities):
                 if quantity != 'time' and quantity != 'elevation':
-                    num = int(k*100+j)
-                    pylab.figure(num)
+                    pylab.figure(int(k*100+j))
                     pylab.ylabel(quantities_label[quantity])
                     pylab.plot(t,