Changeset 8072

Timestamp:

Nov 18, 2010, 5:43:16 PM (14 years ago)

Author:

steve

Message:

Fixing up swb code

Location:

trunk/anuga_core/source/anuga/shallow_water_balanced

Files:

• swb_domain.py (modified) (1 diff)
• test_swb_forcing_terms.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/shallow_water_balanced/swb_domain.py

@@ -82 +82 @@
         self.set_timestepping_method(2)
         self.set_default_order(2)
-        self.set_new_mannings_function(True)
+        self.set_sloped_mannings_function(True)
         self.set_centroid_transmissive_bc(True)
         self.set_CFL(1.0)

trunk/anuga_core/source/anuga/shallow_water_balanced/test_swb_forcing_terms.py

@@ -222 +222 @@
 
 
-    def test_manning_friction_old(self):
+    def test_manning_friction_not_sloped(self):
         from anuga.config import g
 
@@ -239 +239 @@
 
         #Turn old mannings function on
-        domain.set_new_mannings_function(False)
+        domain.set_sloped_mannings_function(False)
 
         #Set up for a gradient of (3,0) at mid triangle (bce)
@@ -301 +301 @@
 
 
-    def test_manning_friction_new(self):
+    def test_manning_friction_sloped(self):
         from anuga.config import g
 
@@ -319 +319 @@
         # Use the new function which takes into account the extra
         # wetted area due to slope of bed
-        domain.set_new_mannings_function(True)
+        domain.set_sloped_mannings_function(True)
         
         #Set up for a gradient of (3,0) at mid triangle (bce)