Changeset 4551 for anuga_core/source/anuga/utilities

Timestamp:

Jun 20, 2007, 6:34:00 PM (18 years ago)

Author:

ole

Message:

Introduced maximal_inundation_elevation (runup) for sww files

Location:

anuga_core/source/anuga/utilities

Files:

• numerical_tools.py (modified) (1 diff)
• test_numerical_tools.py (modified) (2 diffs)

anuga_core/source/anuga/utilities/numerical_tools.py

@@ -246 +246 @@
                      If not, an attempt is made to convert it to a Numeric
                      array
+        A: Scalar.   Return 0-dimensional array of length 1, containing that value
+        A: String.   Array of ASCII values
         typecode: Numeric type. If specified, use this in the conversion.
                                 If not, let Numeric decide

anuga_core/source/anuga/utilities/test_numerical_tools.py

@@ -77 +77 @@
     def test_ensure_numeric(self):
         from numerical_tools import ensure_numeric
-        from Numeric import ArrayType, Float, array
+        from Numeric import ArrayType, Float, Int, array
 
         A = [1,2,3,4]
@@ -122 +122 @@
         assert A is not B   #Not the same object
 
+        # Check scalars
+        A = 1
+        B = ensure_numeric(A, Float)
+        #print A, B[0], len(B), type(B) 
+        #print B.shape
+        assert A == B
+
+        B = ensure_numeric(A, Int)        
+        #print A, B
+        #print B.shape
+        assert A == B
+
+        # Error situation
+
+        B = ensure_numeric('hello', Int)                
+        assert allclose(B, [104, 101, 108, 108, 111])
 
     def test_gradient(self):