Changeset 7824

Timestamp:

Jun 11, 2010, 7:45:03 PM (14 years ago)

Author:

steve

Message:

test_sww_vel_domain is nowworking with numpy

Location:

anuga_work/development/pipeflow

Files:

• test_sww_domain.py (modified) (4 diffs)
• test_sww_vel_domain.py (moved) (moved from anuga_work/development/pipeflow/test_sww_domain_vel.py) (6 diffs)

anuga_work/development/pipeflow/test_sww_domain.py

@@ -40 +40 @@
         domain.distribute_to_vertices_and_edges()
         domain.compute_fluxes()
-
-        print domain.quantities['stage'].explicit_update
-        print domain.quantities['xmomentum'].explicit_update
-
-        print stage_ud
-        print xmom_ud
 
         assert numpy.allclose( domain.quantities['stage'].explicit_update, stage_ud )
@@ -125 +119 @@
 
         for t in domain.evolve(yieldstep=yieldstep, finaltime=finaltime):
-            #pass
+            pass
         
-            print domain.quantities['stage'].vertex_values
-            print domain.quantities['elevation'].vertex_values
-            print domain.quantities['xmomentum'].vertex_values
-          
-        
-            print domain.quantities['stage'].centroid_values  
-            print domain.quantities['elevation'].centroid_values
-            print domain.quantities['xmomentum'].centroid_values    
 
         assert numpy.allclose( 10.0*numpy.ones(10), domain.quantities['stage'].centroid_values )
@@ -161 +147 @@
             pass
         
-        assert numpy.allclose( 10.0*ones(10), domain.quantities['stage'].centroid_values )
-        assert numpy.allclose( zeros(10), domain.quantities['xmomentum'].centroid_values )
+        assert numpy.allclose( 10.0*numpy.ones(10), domain.quantities['stage'].centroid_values )
+        assert numpy.allclose( numpy.zeros(10), domain.quantities['xmomentum'].centroid_values )
 
     def test_evolve_second_order_space_time(self):
@@ -186 +172 @@
             pass
         
-        assert numpy.allclose( 10.0*ones(10), domain.quantities['stage'].centroid_values )
-        assert numpy.allclose( zeros(10), domain.quantities['xmomentum'].centroid_values )
+        assert numpy.allclose( 10.0*numpy.ones(10), domain.quantities['stage'].centroid_values )
+        assert numpy.allclose( numpy.zeros(10), domain.quantities['xmomentum'].centroid_values )
 
 

anuga_work/development/pipeflow/test_sww_vel_domain.py

@@ -5 +5 @@
 
 
-from shallow_water_vel_domain import *
-
-
-from Numeric import allclose, array, ones, Float, maximum, zeros
+from sww_vel_domain import *
+
+
+from numpy import allclose, array, ones, maximum, zeros
+import numpy
 
 
@@ -110 +111 @@
         domain.update_boundary()
 
-        stage_ud, xmom_ud = local_compute_fluxes(domain)
+        import sww_python
+        stage_ud, xmom_ud = sww_python.compute_fluxes(domain)
 
         domain.compute_fluxes()
@@ -126 +128 @@
 #        print domain.quantities['velocity'].boundary_values
         
-        print domain.quantities['stage'].explicit_update
-        print domain.quantities['xmomentum'].explicit_update
-
-        print stage_ud
-        print xmom_ud
 
         assert allclose( domain.quantities['stage'].explicit_update, stage_ud )
@@ -138 +135 @@
     def test_local_flux_function(self):
         normal = 1.0
-        ql = array([1.0, 2.0],Float)
-        qr = array([1.0, 2.0],Float)
+        ql = array([1.0, 2.0],numpy.float)
+        qr = array([1.0, 2.0],numpy.float)
         zl = 0.0
         zr = 0.0
 
         #This assumes h0 = 1.0e-3!!
-        edgeflux, maxspeed = local_flux_function(normal, ql,qr,zl,zr)
+        import sww_python
+        edgeflux, maxspeed = sww_python.flux_function(normal, ql,qr,zl,zr)
         #print maxspeed
         #print edgeflux
         
-        assert allclose(array([2.0, 8.9],Float), edgeflux, rtol=1.0e-005)
+        assert allclose([2.0, 8.9], edgeflux, rtol=1.0e-005)
         assert allclose(5.1305, maxspeed, rtol=1.0e-005)
 
         normal = -1.0
-        ql = array([1.0, 2.0],Float)
-        qr = array([1.0, 2.0],Float)
+        ql = array([1.0, 2.0],numpy.float)
+        qr = array([1.0, 2.0],numpy.float)
         zl = 0.0
         zr = 0.0
 
-        edgeflux, maxspeed = local_flux_function(normal, ql,qr,zl,zr)
+        edgeflux, maxspeed = sww_python.flux_function(normal, ql,qr,zl,zr)
 
 
@@ -163 +161 @@
         #print edgeflux        
         
-        assert allclose(array([-2.0, -8.9],Float), edgeflux, rtol=1.0e-005)
+        assert allclose([-2.0, -8.9], edgeflux, rtol=1.0e-005)
         assert allclose(5.1305, maxspeed, rtol=1.0e-005)
 
@@ -189 +187 @@
         #print domain.quantities['xmomentum'].explicit_update       
 
-        assert allclose( array([-34.3, -24.5, -14.7], Float), domain.quantities['xmomentum'].explicit_update )
+        assert allclose( [-34.3, -24.5, -14.7], domain.quantities['xmomentum'].explicit_update )