Changeset 5162 for anuga_core/source/anuga/shallow_water/shallow_water_domain.py

Timestamp:

Mar 11, 2008, 8:43:22 PM (16 years ago)

Author:

steve

Message:

Updated some methods for quantity. Looks like we can use old
limiting system with larger values of beta.

File:

• anuga_core/source/anuga/shallow_water/shallow_water_domain.py (modified) (8 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -103 +103 @@
 from anuga.config import alpha_balance
 from anuga.config import optimise_dry_cells
+from anuga.config import optimised_gradient_limiter
 
 #---------------------
@@ -176 +177 @@
         self.minimum_storable_height = minimum_storable_height
         self.quantities_to_be_stored = ['stage','xmomentum','ymomentum']
-        
+
+        # Limiters
+        self.use_old_limiter = True
+
+        self.optimised_gradient_limiter = optimised_gradient_limiter
                 
 
@@ -187 +192 @@
         self.beta_w      = beta
         self.beta_w_dry  = beta
+        self.quantities['stage'].beta = beta
+        
         self.beta_uh     = beta
         self.beta_uh_dry = beta
+        self.quantities['xmomentum'].beta = beta
+        
         self.beta_vh     = beta
         self.beta_vh_dry = beta
+        self.quantities['ymomentum'].beta = beta
+        
         self.beta_h      = beta
         
@@ -384 +395 @@
         # Call correct module function
         # (either from this module or C-extension)
-        distribute_to_vertices_and_edges(self)
+        if self.use_old_limiter:
+            distribute_to_vertices_and_edges(self)
+        else:
+            for name in self.conserved_quantities:
+                Q = self.quantities[name]
+                if self._order_ == 1:
+                    Q.extrapolate_first_order()
+                elif self._order_ == 2:
+                    Q.extrapolate_second_order_and_limit()
+                    if name == 'stage':
+                        Q.bound_vertices_below_by_quantity(self.quantities['elevation'])
+                else:
+                    raise 'Unknown order'
+ 
 
 
@@ -399 +423 @@
         # self.check_integrity()
 
-        msg = 'Parameter beta_h must be in the interval [0, 1['
-        assert 0 <= self.beta_h <= 1.0, msg
-        msg = 'Parameter beta_w must be in the interval [0, 1['
-        assert 0 <= self.beta_w <= 1.0, msg
+        msg = 'Parameter beta_h must be in the interval [0, 2['
+        assert 0 <= self.beta_h <= 2.0, msg
+        msg = 'Parameter beta_w must be in the interval [0, 2['
+        assert 0 <= self.beta_w <= 2.0, msg
 
 
@@ -737 +761 @@
     """
 
-    from anuga.config import optimised_gradient_limiter
+    
 
     # Remove very thin layers of water
@@ -743 +767 @@
 
     # Extrapolate all conserved quantities
-    if optimised_gradient_limiter:
+    if domain.optimised_gradient_limiter:
         # MH090605 if second order,
         # perform the extrapolation and limiting on
@@ -764 +788 @@
                 Q.extrapolate_first_order()
             elif domain._order_ == 2:
-
-                # Experiment
-                #if name == 'stage':
-                #    #print name, 'second'
-                #    Q.extrapolate_second_order()
-                #    Q.limit()
-                #else:
-                #    #print name, 'first'                
-                #    Q.extrapolate_first_order()
-                #    #Q.extrapolate_second_order()
-                #    #Q.limit()                
-                
                 Q.extrapolate_second_order()
                 Q.limit()