Changeset 5832 for anuga_work/development/anuga_1d/test_shallow_water.py

Timestamp:

Oct 11, 2008, 12:38:18 PM (16 years ago)

Author:

steve

Message:

 

File:

• anuga_work/development/anuga_1d/test_shallow_water.py (modified) (3 diffs)

anuga_work/development/anuga_1d/test_shallow_water.py

@@ -5 +5 @@
 
 
-from shallow_water_domain_new import *
-from shallow_water_domain_new import flux_function as domain_flux_function
+#from shallow_water_domain import *
+#from shallow_water_domain import flux_function as domain_flux_function
+
+from shallow_water_domain_suggestion1 import *
+from shallow_water_domain_suggestion1 import flux_function as domain_flux_function
 
 from Numeric import allclose, array, ones, Float, maximum, zeros
@@ -36 +39 @@
 
         stage_ud, xmom_ud = local_compute_fluxes(domain)
-        
+
+        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 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 )
@@ -316 +321 @@
             try:
                 #timestep = min(timestep, 0.5*domain.radii[k]/max_speed)
-                timestep = min(timestep, domain.cfl*0.5*domain.areas[k]/max_speed)
+                timestep = min(timestep, domain.CFL*0.5*domain.areas[k]/max_speed)
             except ZeroDivisionError:
                 pass