Changeset 8406

Timestamp:

Apr 19, 2012, 11:14:06 PM (13 years ago)

Author:

steve

Message:

Added another flow_algorithm 1.75

Location:

trunk/anuga_core/source/anuga

Files:

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

trunk/anuga_core/source/anuga/config.py

@@ -102 +102 @@
 ################################################################################
 
-sloped_mannings_function = True
+sloped_mannings_function = False
 
 ################################################################################
@@ -117 +117 @@
 # beta values. In this case the settings for timestepping_method will be overriden 
 
-#flow_algorithm = 1   # 1st order euler and conservative piecewise constant spatial reconstruction
-flow_algorithm = 1.5 # 1st order euler and conservative piecewise linear spatial reconstruction
-#flow_algorithm = 2   # 2nd order TVD scheme and more aggressive piecewise linear spatial reconstruction
-#flow_algorithm = 2.5 # 3rd order TVD scheme and more aggressive piecewise linear spatial reconstruction
+#flow_algorithm = 1    # 1st order euler and conservative piecewise constant spatial reconstruction
+flow_algorithm = 1.5  # 1st order euler and conservative piecewise linear spatial reconstruction
+#flow_algorithm = 1.75 # 1st order euler and more aggressive piecewise linear spatial reconstruction
+#flow_algorithm = 2    # 2nd order TVD scheme and more aggressive piecewise linear spatial reconstruction
+#flow_algorithm = 2.5  # 3rd order TVD scheme and more aggressive piecewise linear spatial reconstruction
 
 

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

@@ -360 +360 @@
         flag = str(flag)
 
-        flow_algorithms = ['1', '1.5', '2', '2.5']
+        flow_algorithms = ['1', '1.5', '1.75', '2', '2.5']
 
         if flag in flow_algorithms:
@@ -366 +366 @@
         else:
             msg = 'Unknown flow_algorithm. \nPossible choices are:\n'+ \
-            ', '.join(flow_algorithm)+'.'
+            ', '.join(flow_algorithms)+'.'
             raise Exception(msg)
 
@@ -386 +386 @@
 
 
-        if self.flow_algorithm == '2':
-            self.set_timestepping_method(2)
+        if self.flow_algorithm == '1.75':
+            self.set_timestepping_method(1)
             self.set_default_order(2)
             beta_w      = 1.5
@@ -397 +397 @@
             self.set_betas(beta_w, beta_w_dry, beta_uh, beta_uh_dry, beta_vh, beta_vh_dry)
 
+
+        if self.flow_algorithm == '2':
+            self.set_timestepping_method(2)
+            self.set_default_order(2)
+            beta_w      = 1.7
+            beta_w_dry  = 0.2
+            beta_uh     = 1.7
+            beta_uh_dry = 0.2
+            beta_vh     = 1.7
+            beta_vh_dry = 0.2
+            self.set_betas(beta_w, beta_w_dry, beta_uh, beta_uh_dry, beta_vh, beta_vh_dry)
+
         if self.flow_algorithm == '2.5':
             self.set_timestepping_method(3)
             self.set_default_order(2)
-            beta_w      = 1.5
+            beta_w      = 1.7
             beta_w_dry  = 0.2
-            beta_uh     = 1.5
+            beta_uh     = 1.7
             beta_uh_dry = 0.2
-            beta_vh     = 1.5
+            beta_vh     = 1.7
             beta_vh_dry = 0.2
             self.set_betas(beta_w, beta_w_dry, beta_uh, beta_uh_dry, beta_vh, beta_vh_dry)