Changeset 1591 for inundation/ga/storm_surge/pyvolution/shallow_water.py

Timestamp:

Jul 11, 2005, 11:40:37 AM (19 years ago)

Author:

ole

Message:

Introduced flag for new hardwired gradient-limiter

File:

• inundation/ga/storm_surge/pyvolution/shallow_water.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -574 +574 @@
     """
 
+    from config import optimised_gradient_limiter
+
     #Remove very thin layers of water
     protect_against_infinitesimal_and_negative_heights(domain)
 
     #Extrapolate all conserved quantities
-    #MH090605 if second order, perform the extrapolation and limiting on all of the conserved quantities
-    if (domain.order == 1):
+    if optimised_gradient_limiter:
+        #MH090605 if second order,
+        #perform the extrapolation and limiting on
+        #all of the conserved quantitie
+        
+        if (domain.order == 1):
+            for name in domain.conserved_quantities:
+                Q = domain.quantities[name]
+                Q.extrapolate_first_order()
+        elif domain.order == 2:
+            domain.extrapolate_second_order_sw()
+        else:
+            raise 'Unknown order'
+    else:    
+        #old code:
         for name in domain.conserved_quantities:
             Q = domain.quantities[name]
-            Q.extrapolate_first_order()
-    elif domain.order == 2:
-        domain.extrapolate_second_order_sw()
-    else:
-        raise 'Unknown order'
-
-    #old code:
-    #for name in domain.conserved_quantities:
-    #    Q = domain.quantities[name]
-    #    if domain.order == 1:
-    #        Q.extrapolate_first_order()
-    #    elif domain.order == 2:
-    #        #Q.extrapolate_second_order()
-    #        Q.limit()
-    #    else:
-    #        raise 'Unknown order'
+            if domain.order == 1:
+                Q.extrapolate_first_order()
+            elif domain.order == 2:
+                Q.extrapolate_second_order()
+                Q.limit()
+            else:
+                raise 'Unknown order'
+            
 
     #Take bed elevation into account when water heights are small