Changeset 8402

Timestamp:

Apr 16, 2012, 7:53:56 AM (13 years ago)

Author:

steve

Message:

Changed over default to use velocity_extrapolation and wb_2 flux calculation.
This leads to 18 unit test failures. Need to fix them, but they are not significant.

Location:

trunk/anuga_core/source/anuga

Files:

• config.py (modified) (1 diff)
• shallow_water/shallow_water_domain.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/config.py

@@ -103 +103 @@
 # Option to use velocity extrapolation instead of momentum extrapolation in the
 # routine domain.extrapolate_second_order_sw
-extrapolate_velocity_second_order=False
+extrapolate_velocity_second_order=True
 
 # Option to setup compute_fluxes_method
-# Currently "original' and 'well_balanced_1'
-compute_fluxes_method = 'original'
+# Currently "original' and 'wb_1' to 'wb_3'
+compute_fluxes_method = 'wb_2'
 
 ################################################################################

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -679 +679 @@
 
         elif self.compute_fluxes_method == 'wb_1':
+            # Calc pressure terms using Simpson rule in flux
+            # computations. Then they match up exactly with
+            # standard gravity term
             from shallow_water_ext import compute_fluxes_ext_wb
             from shallow_water_ext import gravity as gravity_c
@@ -686 +689 @@
 
         elif self.compute_fluxes_method == 'wb_2':
+            # Use standard flux calculation, but calc gravity
+            # as -g h grad(w) - sum midpoint edge pressure terms
             from shallow_water_ext import compute_fluxes_ext_central_structure
             from shallow_water_ext import gravity_wb as gravity_wb_c
@@ -693 +698 @@
 
         elif self.compute_fluxes_method == 'wb_3':
+            # Calculate pure flux terms with simpsons rule, and
+            # gravity flux and gravity forcing via
+            # as -g h grad(w) - sum midpoint edge pressure terms
             from shallow_water_ext import compute_fluxes_ext_wb_3
             from shallow_water_ext import gravity_wb as gravity_wb_c
@@ -701 +709 @@
         else:
             raise Exception('unknown compute_fluxes_method')
+
+            # TODO (SR)
+            # Should implement wb_4 as simpsons rule on both pure
+            # flux and pressure flux terms, ie a combination of wb_1
+            # and wb_3
+            # Also Gareth's wb scheme should be included.
+            # Mabe should come up with better names!