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

Timestamp:

Sep 4, 2007, 5:36:01 PM (16 years ago)

Author:

ole

Message:

Work towards ticket:192

File:

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

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -173 +173 @@
         self.forcing_terms.append(gravity)
 
-        #Stored output
+        # Stored output
         self.store = True
         self.format = 'sww'
@@ -179 +179 @@
         self.minimum_storable_height = minimum_storable_height
         self.quantities_to_be_stored = ['stage','xmomentum','ymomentum']
+        
                 
 
@@ -234 +235 @@
 
         #FIXME (Ole): rename H0 to minimum_allowed_height_in_flux_computation
-        #rename tight_slope_limiters to tight_slope_limiters.
-        #Maybe use histogram to identify isolated extreme speeds and deal with them adaptively
-        #similarly to how we used to use 1 order steps to recover.
+
+        #FIXME (Ole): Maybe use histogram to identify isolated extreme speeds
+        #and deal with them adaptively similarly to how we used to use 1 order
+        #steps to recover.
         self.minimum_allowed_height = minimum_allowed_height
         self.H0 = minimum_allowed_height   
@@ -262 +264 @@
         self.points_file_block_line_size = points_file_block_line_size
         
+        
     def set_quantities_to_be_stored(self, q):
         """Specify which quantities will be stored in the sww file.
@@ -286 +289 @@
             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'\
@@ -930 +933 @@
         #MH090605 if second order,
         #perform the extrapolation and limiting on
-        #all of the conserved quantitie
+        #all of the conserved quantities
 
         if (domain._order_ == 1):
@@ -944 +947 @@
         for name in domain.conserved_quantities:
             Q = domain.quantities[name]
+
             if domain._order_ == 1:
                 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()