Changeset 7447 for anuga_core/source/anuga_parallel/test_parallel_sw.py

Timestamp:

Aug 28, 2009, 2:34:39 PM (14 years ago)

Author:

steve

Message:

Concentrating code

File:

• anuga_core/source/anuga_parallel/test_parallel_sw.py (modified) (7 diffs)

anuga_core/source/anuga_parallel/test_parallel_sw.py

@@ -1 @@
-#!/usr/bin/env python
 
 """Test a run of the sequential shallow water domain against
@@ -17 +16 @@
 import pypar
 
-from Numeric import allclose, array, zeros, Float, take, nonzero
+#from Numeric import allclose, array, zeros, Float, take, nonzero
+
+import numpy as num
 
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
-from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross
+from anuga.interface import rectangular_cross
 from anuga.abstract_2d_finite_volumes.pmesh2domain import pmesh_to_domain_instance
 
@@ -28 +29 @@
 from anuga.utilities.norms           import l1_norm, l2_norm, linf_norm
 
-from anuga.shallow_water import Domain
-from anuga.shallow_water import Reflective_boundary
-from anuga.shallow_water import Dirichlet_boundary
-from anuga.shallow_water import Time_boundary
-from anuga.shallow_water import Transmissive_boundary
+from anuga.interface import Domain
+from anuga.interface import Reflective_boundary
+from anuga.interface import Dirichlet_boundary
+from anuga.interface import Time_boundary
+from anuga.interface import Transmissive_boundary
 
 
@@ -69 +70 @@
 def evolution_test(parallel=False):
 
+
     domain = pmesh_to_domain_instance(mesh_filename, Domain)
     domain.set_quantity('stage', Set_Stage(756000.0, 756500.0, 2.0))
@@ -95 +97 @@
     l2list = []
     linflist = []
-    l1norm = zeros(3, Float)
-    l2norm = zeros(3, Float)
-    linfnorm = zeros(3, Float)
-    recv_norm = zeros(3, Float)
+    l1norm = num.zeros(3, num.float)
+    l2norm = num.zeros(3, num.float)
+    linfnorm = num.zeros(3, num.float)
+    recv_norm = num.zeros(3, num.float)
 
     #------------------------------------------------------------------------------
@@ -109 +111 @@
         
     for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
-        edges = take(domain.quantities[quantity].edge_values, nonzero(domain.tri_full_flag))
+        edges = domain.quantities[quantity].edge_values.take(num.flatnonzero(domain.tri_full_flag),axis=0)
         l1norm[0] = l1_norm(edges[:,0])
         l1norm[1] = l1_norm(edges[:,1])
@@ -128 +130 @@
                 #print edges[:,1]            
                 for p in range(1, numprocs):
-                    pypar.receive(p, recv_norm)
+                    recv_norm = pypar.receive(p)
                     l1norm += recv_norm
-                    pypar.receive(p, recv_norm)
+                    recv_norm = pypar.receive(p)
                     l2norm += recv_norm
-                    pypar.receive(p, recv_norm)
+                    recv_norm = pypar.receive(p)
                     linfnorm[0] = max(linfnorm[0], recv_norm[0])
                     linfnorm[1] = max(linfnorm[1], recv_norm[1])