Changeset 7788

Timestamp:

Jun 5, 2010, 7:06:44 PM (15 years ago)

Author:

steve

Message:

cleaning up pipeflow directory

Location:

anuga_work/development/pipeflow

Files:

• comp_flux_ext.c (deleted)
• comp_flux_ext_wellbalanced.c (deleted)
• generic_domain.py (moved) (moved from anuga_work/development/pipeflow/domain.py) (1 diff)
• shallow_water_domain.py (deleted)
• test_sww_domain.py (moved) (moved from anuga_work/development/pipeflow/test_shallow_water_domain.py) (3 diffs)
• test_sww_domain_vel.py (moved) (moved from anuga_work/development/pipeflow/test_shallow_water_vel_domain.py)

anuga_work/development/pipeflow/generic_domain.py

@@ -12 +12 @@
 
 
-class Domain:
+class Generic_Domain:
 
     def __init__(self,

anuga_work/development/pipeflow/test_sww_domain.py

@@ -5 +5 @@
 
 
-from shallow_water_domain import *
-from shallow_water_domain import flux_function as domain_flux_function
-
+from sww_domain import *
+import sww_python
 
 
@@ -37 +36 @@
         domain.set_boundary({'exterior' : Reflective_boundary(domain)})
 
-        stage_ud, xmom_ud = local_compute_fluxes(domain)
+        stage_ud, xmom_ud = sww_python.compute_fluxes(domain)
 
         domain.distribute_to_vertices_and_edges()
@@ -81 +80 @@
         assert numpy.allclose(5.1305, maxspeed, rtol=1.0e-005)
 
-    def test_domain_flux_function(self):
-        normal = 1.0
-        ql = numpy.array([1.0, 2.0],numpy.float)
-        qr = numpy.array([1.0, 2.0],numpy.float)
-        zl = 0.0
-        zr = 0.0
-
-        edgeflux, maxspeed = local_flux_function(normal, ql,qr,zl,zr)
-
-        #print edgeflux
-
-
-
-        domainedgeflux, domainmaxspeed = domain_flux_function(normal, ql,qr,zl,zr)
-
-        #print domainedgeflux
-
-        assert numpy.allclose(domainedgeflux, edgeflux)
-        assert numpy.allclose(domainmaxspeed, maxspeed)
+
 
     def test_gravity(self):