Changeset 5844

Timestamp:

Oct 17, 2008, 5:03:44 PM (16 years ago)

Author:

steve

Message:

Updating domain etc to take conserved, evolved and other quantitiies

Location:

anuga_work/development/anuga_1d

Files:

• comp_flux_ext.c (modified) (1 diff)
• domain.py (modified) (2 diffs)
• dry_dam_sudi.py (modified) (5 diffs)
• quantity.py (modified) (1 diff)
• test_shallow_water_domain.py (moved) (moved from anuga_work/development/anuga_1d/test_shallow_water.py) (1 diff)

anuga_work/development/anuga_1d/comp_flux_ext.c

@@ -287 +287 @@
 
 
+//-----------------------
 PyObject *compute_fluxes_ext_short(PyObject *self, PyObject *args) {
   

anuga_work/development/anuga_1d/domain.py

@@ -787 +787 @@
 
         possible_limiters = \
-        ['pyvolution', 'steve_minmod', 'minmod', 'minmod_kurganov', 'superbee', 'vanleer', 'vanalbada']
+        ['pyvolution', 'minmod_steve', 'minmod', 'minmod_kurganov', 'superbee', 'vanleer', 'vanalbada']
 
         if limiter in possible_limiters:
@@ -1458 +1458 @@
         for i, ((vol_id, vertex_id), B) in enumerate(self.boundary_objects):
             q = B.evaluate(vol_id, vertex_id)
-
+            #print 'q ',q
             for j, name in enumerate(self.evolved_quantities):
+                #print 'name %s j = %f \n'%(name,j)
                 Q = self.quantities[name]
                 Q.boundary_values[i] = q[j]

anuga_work/development/anuga_1d/dry_dam_sudi.py

@@ -1 +1 @@
 import os
 from math import sqrt, pi
-from shallow_water_domain_suggestion1 import *
+from shallow_water_vel_domain import *
 from Numeric import allclose, array, zeros, ones, Float, take, sqrt
 from config import g, epsilon
+
+
+h1 = 10.0
+h0 = 0.0
 
 def analytical_sol(C,t):
@@ -9 +13 @@
     #t  = 0.0     # time (s)
     # gravity (m/s^2)
-    h1 = 10.0    # depth upstream (m)
-    h0 = 0.0     # depth downstream (m)
+    #h1 = 10.0    # depth upstream (m)
+    #h0 = 0.0     # depth downstream (m)
     L = 2000.0   # length of stream/domain (m)
     n = len(C)    # number of cells
@@ -66 +70 @@
 
 def stage(x):
-    h1 = 10.0
-    h0 = 0.0
     y = zeros(len(x),Float)
     for i in range(len(x)):
@@ -81 +83 @@
 import time
 
-finaltime = 5.0
+finaltime = 10.0
 yieldstep = finaltime
 L = 2000.0     # Length of channel (m)
-number_of_cells = [1610]#,200,500,1000,2000,5000,10000,20000]
+number_of_cells = [810]#,200,500,1000,2000,5000,10000,20000]
 h_error = zeros(len(number_of_cells),Float)
 uh_error = zeros(len(number_of_cells),Float)
@@ -101 +103 @@
     domain.set_boundary({'exterior': Reflective_boundary(domain)})
     domain.order = 2
-    domain.set_timestepping_method('rk3')
-    domain.cfl = 1.0
-    domain.limiter = "vanleer"
+    domain.set_timestepping_method('rk2')
+    domain.set_CFL(1.0)
+    domain.set_limiter("vanleer")
+    #domain.h0=0.0001
 
     t0 = time.time()

anuga_work/development/anuga_1d/quantity.py

@@ -632 +632 @@
                 qv[k,1] = qc[k] + G[k]*(x1-x)
             self.limit_pyvolution()
-        elif self.domain.limiter == "steve_minmod":
+        elif self.domain.limiter == "minmod_steve":
             self.limit_minmod()
         else:

anuga_work/development/anuga_1d/test_shallow_water_domain.py

@@ -5 +5 @@
 
 
-#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 shallow_water_domain import *
+from shallow_water_domain import flux_function as domain_flux_function
+
+
 
 from Numeric import allclose, array, ones, Float, maximum, zeros