Changeset 7861

Timestamp:

Jun 18, 2010, 6:05:23 PM (14 years ago)

Author:

hudson

Message:

Fixed AABB parameter passing bug.

Location:

trunk/anuga_core/source/anuga

Files:

• file/sww.py (modified) (1 diff)
• file_conversion/test_csv2sts.py (modified) (2 diffs)
• geometry/aabb.py (modified) (1 diff)
• pmesh/test_meshquad.py (modified) (1 diff)
• shallow_water/boundaries.py (modified) (4 diffs)

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

@@ -790 +790 @@
                 outfile.variables[q][slice_index] = x
                     
-        
                 # This updates the _range values
                 q_range = outfile.variables[q + Write_sww.RANGE][:]

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

@@ -1 +1 @@
 #external modules
 import os
+import sys
 import unittest
 import numpy as num
@@ -75 +76 @@
         Make sure that the python file functions as a command-line tool.
         """
-        cmd = 'python csv2sts.py --latitude ' + str(lat) + ' --lon ' + str(lon)
-        cmd += ' ' + testfile_csv + ' ' + sts_out
-        print cmd
+        
+        cmd = 'python ' + sys.path[0] + os.sep +'csv2sts.py --latitude ' 
+        cmd += '%s --lon %s %s %s' % (str(lat), str(lon), testfile_csv, sts_out)
+        
         os.system(cmd)
         self._check_generated_sts()

trunk/anuga_core/source/anuga/geometry/aabb.py

@@ -24 +24 @@
             ymax is maximum y (absolute coord, ie, not size)
         """
-        if not xmax:
+        if xmax is None:
             # try treating first arg as a list of points
             try:

trunk/anuga_core/source/anuga/pmesh/test_meshquad.py

@@ -2 +2 @@
 import numpy as num
 
-from aabb import AABB
+from anuga.geometry.aabb import AABB
 from quad import Cell
 from mesh_quadtree import MeshQuadtree

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

@@ -182 +182 @@
         return sea_level + normalized_amplitude/cosh(t-25)**2
 
-    Bts = Transmissive_n_momentum_zero_t_momentum_set_stage_boundary(domain, waveform)
+    Bts = Transmissive_n_momentum_zero_t_momentum_set_stage_boundary\
+                            (domain, waveform)
 
     Underlying domain must be specified when boundary is instantiated
@@ -243 +244 @@
             x = float(value[0])
 
-        ## import math
-        ## if vol_id == 9433:
-        ##     print 'vol_id = ',vol_id, ' edge_id = ',edge_id, 'q = ', q, ' x = ',x
-        ##     print 'normal = ', normal
-        ##     print 'n . p = ', (normal[0]*q[1] + normal[1]*q[2])
-        ##     print 't . p = ', (normal[1]*q[1] - normal[0]*q[2])
-
-
         q[0] = x
         ndotq = (normal[0]*q[1] + normal[1]*q[2])
@@ -398 +391 @@
         # Where v is velocity, n is manning's coefficient, h is depth
         # and S is the slope into the domain. 
-        # Let mu be the momentum (vh), then this equation becomes: mu = 1/n h^{5/3} sqrt(S) 
+        # Let mu be the momentum (vh), then this equation becomes:
+        #            mu = 1/n h^{5/3} sqrt(S) 
         # from which we can isolate depth to get
-        # h = (mu n/sqrt(S) )^{3/5} 
+        #             h = (mu n/sqrt(S) )^{3/5} 
         
         slope = 0 # get gradient for this triangle dot normal
         
         # get manning coef from this triangle
-        friction = self.domain.get_quantity('friction').get_values(location='edges', 
-                                                                   indices=[vol_id])[0]
+        friction = self.domain.get_quantity('friction').get_values(\
+                    location='edges', indices=[vol_id])[0]
         mannings_n = friction[edge_id]
 
         if slope > epsilon and mannings_n > epsilon:
-            depth = pow(self.average_momentum * mannings_n/math.sqrt(slope), 3.0/5) 
+            depth = pow(self.average_momentum * mannings_n/math.sqrt(slope), \
+                        3.0/5) 
         else:
             depth = 1.0
@@ -416 +411 @@
         # Elevation on this edge    
         
-        z = self.domain.get_quantity('elevation').get_values(location='edges', 
-                                                             indices=[vol_id])[0]
+        z = self.domain.get_quantity('elevation').get_values(\
+                    location='edges', indices=[vol_id])[0]
         elevation = z[edge_id]