Changeset 2648 for inundation/pyvolution/shallow_water.py

Timestamp:

Mar 31, 2006, 6:21:26 PM (18 years ago)

Author:

steve

Message:

Looking at island.py example. I changed the order of the implicit and explicit update (in quantity_ext.c) which I think improved the situation a little. But this has left a few fails in the test_all suite which we need to fix up. Mainly small differences in results.

File:

• inundation/pyvolution/shallow_water.py (modified) (11 diffs)

inundation/pyvolution/shallow_water.py

@@ -83 +83 @@
         from config import minimum_allowed_height, maximum_allowed_speed, g
         self.minimum_allowed_height = minimum_allowed_height
-        self.maximum_allowed_speed = maximum_allowed_speed      
+        self.maximum_allowed_speed = maximum_allowed_speed
         self.g = g
 
+
+        self.forcing_terms.append(manning_friction)
         self.forcing_terms.append(gravity)
-        self.forcing_terms.append(manning_friction)
 
         #Realtime visualisation
@@ -108 +109 @@
         self.quantities_to_be_stored = ['stage','xmomentum','ymomentum']
 
-        
+
     def set_quantities_to_be_stored(self, q):
         """Specify which quantities will be stored in the sww file.
@@ -118 +119 @@
 
         In the two first cases, the named quantities will be stored at each yieldstep
-        (This is in addition to the quantities elevation and friction)  
+        (This is in addition to the quantities elevation and friction)
         If q is None, storage will be switched off altogether.
         """
@@ -124 +125 @@
 
         if q is None:
-            self.quantities_to_be_stored = []            
+            self.quantities_to_be_stored = []
             self.store = False
             return
@@ -131 +132 @@
             q = [q] # Turn argument into a list
 
-        #Check correcness    
+        #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 
-        
+            assert quantity_name in self.conserved_quantities, msg
+
         self.quantities_to_be_stored = q
-        
+
 
     def initialise_visualiser(self,scale_z=1.0,rect=None):
@@ -224 +225 @@
                yieldstep = None,
                finaltime = None,
-               duration = None,               
+               duration = None,
                skip_initial_step = False):
         """Specialisation of basic evolve method from parent class
@@ -670 +671 @@
     hc = wc - zc  #Water depths at centroids
 
-    #Update 
+    #Update
     #FIXME: Modify accroditg to c-version - or discard altogether.
     for k in range(domain.number_of_elements):
@@ -695 +696 @@
     from shallow_water_ext import protect
 
-    protect(domain.minimum_allowed_height, domain.maximum_allowed_speed, 
+    protect(domain.minimum_allowed_height, domain.maximum_allowed_speed,
             domain.epsilon, wc, zc, xmomc, ymomc)
 
@@ -1183 +1184 @@
 
 
-def manning_friction_c(domain):
+def manning_friction_implicit_c(domain):
     """Wrapper for c version
     """
@@ -1200 +1201 @@
     xmom_update = xmom.semi_implicit_update
     ymom_update = ymom.semi_implicit_update
+
+    N = domain.number_of_elements
+    eps = domain.minimum_allowed_height
+    g = domain.g
+
+    from shallow_water_ext import manning_friction
+    manning_friction(g, eps, w, z, uh, vh, eta, xmom_update, ymom_update)
+
+
+def manning_friction_explicit_c(domain):
+    """Wrapper for c version
+    """
+
+    xmom = domain.quantities['xmomentum']
+    ymom = domain.quantities['ymomentum']
+
+    w = domain.quantities['stage'].centroid_values
+    z = domain.quantities['elevation'].centroid_values
+
+    uh = xmom.centroid_values
+    vh = ymom.centroid_values
+    eta = domain.quantities['friction'].centroid_values
+
+    xmom_update = xmom.explicit_update
+    ymom_update = ymom.explicit_update
 
     N = domain.number_of_elements
@@ -1791 +1817 @@
     extrapolate_second_order_sw=extrapolate_second_order_sw_c
     gravity = gravity_c
-    manning_friction = manning_friction_c
+    manning_friction = manning_friction_implicit_c
     h_limiter = h_limiter_c
     balance_deep_and_shallow = balance_deep_and_shallow_c