Changeset 6042 for anuga_work/development/anuga_1d/shallow_water_vel_domain.py

Timestamp:

Dec 2, 2008, 9:46:45 AM (16 years ago)

Author:

steve

Message:

Found bug associated with changing max_speed_array to an integer

File:

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

anuga_work/development/anuga_1d/shallow_water_vel_domain.py

@@ -92 +92 @@
 
 
-    def set_quantities_to_be_stored(self, q):
-        """Specify which quantities will be stored in the sww file.
-
-        q must be either:
-          - the name of a quantity
-          - a list of quantity names
-          - None
-
-        In the two first cases, the named quantities will be stored at each
-        yieldstep
-        (This is in addition to the quantities elevation and friction)  
-        If q is None, storage will be switched off altogether.
-        """
-
-
-        if q is None:
-            self.quantities_to_be_stored = []            
-            self.store = False
-            return
-
-        if isinstance(q, basestring):
-            q = [q] # Turn argument into a list
-
-        #Check correcness    
-        for quantity_name in q:
-            msg = 'Quantity %s is not a valid conserved quantity' %quantity_name
-            assert quantity_name in self.conserved_quantities, msg 
-        
-        self.quantities_to_be_stored = q
-        
 
     def check_integrity(self):
@@ -205 +175 @@
 
 
+
 #--------------------------------------------------------------------------
 def distribute_to_vertices_and_edges_limit_w_u(domain):
@@ -255 +226 @@
         
     #print id(h_C)
-    for i in range(N):
-        h_C[i] = w_C[i] - z_C[i]                                                
-        if h_C[i] <= 1.0e-12:
-            #print 'h_C[%d]= %15.5e\n' % (i,h_C[i])
-            h_C[i] = 0.0
-            w_C[i] = z_C[i]
-            #uh_C[i] = 0.0
+##     for i in range(N):
+##      h_C[i] = w_C[i] - z_C[i]                                                
+##         if h_C[i] <= 1.0e-12:
+##          #print 'h_C[%d]= %15.5e\n' % (i,h_C[i])
+##          h_C[i] = 0.0
+##          w_C[i] = z_C[i]
+##          #uh_C[i] = 0.0
             
- #           u_C[i] = 0.0
- #       else:
- #           u_C[i] = uh_C[i]/h_C[i]
+##  #           u_C[i] = 0.0
+##  #       else:
+##  #           u_C[i] = uh_C[i]/h_C[i]
                 
     h0 = 1.0e-12    
-    for i in range(len(h_C)):
+    for i in range(N):
+        h_C[i] = w_C[i] - z_C[i]                                                
         if h_C[i] < 1.0e-12:
             u_C[i] = 0.0  #Could have been negative
             h_C[i] = 0.0
+            w_C[i] = z_C[i]
         else:
-            u_C[i]  = uh_C[i]/(h_C[i] + h0/h_C[i])
-            #u_C[i]  = uh_C[i]/h_C[i]
+            #u_C[i]  = uh_C[i]/(h_C[i] + h0/h_C[i])
+            u_C[i]  = uh_C[i]/h_C[i]
         
     for name in [ 'velocity', 'stage' ]: