Changeset 7886

Timestamp:

Jul 1, 2010, 5:09:54 PM (14 years ago)

Author:

steve

Message:

Copied sudi's directory

Location:

trunk

Files:

• anuga_core/source/anuga/utilities/sparse.py (modified) (2 diffs)
• anuga_core/source/anuga/utilities/util_ext.h (modified) (1 diff)
• anuga_work/development/sudi (copied) (copied from anuga_work/development/sudi)
• anuga_work/development/sudi/sw_2d/yoon_parabolic_basin_cross_mesh.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/utilities/sparse.py

@@ -297 +297 @@
     def __mul__(self, other):
         """Multiply this matrix onto 'other' which can either be
-        a numeric vector, a numeric matrix or another sparse matrix.
+        a numeric vector.
         """
 
@@ -303 +303 @@
             B = num.array(other)
         except:
-            print 'FIXME: Only numeric types implemented so far'
-
-        return csr_mv(self,B) 
+            raise ValueError, 'FIXME: Only numeric types implemented so far'
+
+
+        # Assume numeric types from now on
+
+        if len(B.shape) == 0:
+            # Scalar - use __rmul__ method
+            #R = B*self
+            raise TypeError, 'Sparse matrix X scalar not implemented'
+
+        elif len(B.shape) == 1:
+            # Vector
+            msg = 'Mismatching dimensions: You cannot multiply (%d x %d) matrix onto %d-vector'\
+                  %(self.M, self.N, B.shape[0])
+            assert B.shape[0] == self.N, msg
+
+            R = csr_mv(self,B)
+
+
+        elif len(B.shape) == 2:
+            raise TypeError, 'Sparse matrix X matrix multiplication not implemented'
+
+        else:
+            raise ValueError, 'Dimension too high: d=%d' %len(B.shape)
+
+        return R
+
 
 

trunk/anuga_core/source/anuga/utilities/util_ext.h

@@ -31 +31 @@
 
 
+double sign(double x) {
+  //Return sign of a double
+
+  if (x>0.0) return 1.0;
+  else if (x<0.0) return -1.0;
+  else return 0.0;
+}
+
 int _gradient(double x0, double y0, 
               double x1, double y1, 

trunk/anuga_work/development/sudi/sw_2d/yoon_parabolic_basin_cross_mesh.py

@@ -11 +11 @@
 #---------------
 # Module imports
-#from anuga.shallow_water_balanced.swb_domain import Domain, Transmissive_boundary, Reflective_boundary,\
+from anuga import Domain, Transmissive_boundary, Reflective_boundary,\
+     Dirichlet_boundary, rectangular_cross
+
+#from anuga.interface import Domain, Transmissive_boundary, Reflective_boundary,\
 #     Dirichlet_boundary
-
-from anuga.interface import Domain, Transmissive_boundary, Reflective_boundary,\
-     Dirichlet_boundary
 from math import sqrt, cos, sin, pi
-from anuga.interface import rectangular_cross
-from anuga.utilities.polygon import inside_polygon, is_inside_triangle
+#from anuga.interface import rectangular_cross
+#from anuga.utilities.polygon import inside_polygon, is_inside_triangle
 from numpy import asarray
 
@@ -24 +24 @@
 #-------------------------------
 # Domain
-n = 20#200
-m = 20#200
+n = 4#200
+m = 4#200
 lenx = 8000.0
 leny = 8000.0
@@ -31 +31 @@
 
 points, elements, boundary = rectangular_cross(m, n, lenx, leny, origin)
+
+print points
+print elements
+print boundary
+
 domain = Domain(points, elements, boundary)