Changeset 8047

Timestamp:

Oct 21, 2010, 12:09:11 PM (14 years ago)

Author:

steve

Message:

Changed name of new and old mannings function tobetter correspond to
calculation using the sloped or flat triangle area.

Location:

trunk/anuga_core/source/anuga/shallow_water

Files:

• shallow_water_domain.py (modified) (6 diffs)
• shallow_water_ext.c (modified) (7 diffs)
• test_shallow_water_domain.py (modified) (5 diffs)

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

@@ -209 +209 @@
 
         
-        self.set_new_mannings_function(False)
+        self.set_sloped_mannings_function(False)
 
         self.minimum_storable_height = minimum_storable_height
@@ -219 +219 @@
 
 
-    def set_new_mannings_function(self, flag=True):
-        """Cludge to allow unit test to pass, but to
-        also introduce new mannings friction function
-        which takes into account the slope of the bed.
+    def set_sloped_mannings_function(self, flag=True):
+        """Set mannings friction function to use the sloped
+        wetted area.
         The flag is tested in the python wrapper
         mannings_friction_implicit
         """
         if flag:
-            self.use_new_mannings = True
+            self.use_sloped_mannings = True
         else:
-            self.use_new_mannings = False
+            self.use_sloped_mannings = False
 
 
@@ -1152 +1151 @@
     """
 
-    from shallow_water_ext import manning_friction_old
-    from shallow_water_ext import manning_friction_new
+    from shallow_water_ext import manning_friction_flat
+    from shallow_water_ext import manning_friction_sloped
 
     xmom = domain.quantities['xmomentum']
@@ -1173 +1172 @@
     g = domain.g
 
-    if domain.use_new_mannings:
-        manning_friction_new(g, eps, x, w, uh, vh, z, eta, xmom_update, \
+    if domain.use_sloped_mannings:
+        manning_friction_sloped(g, eps, x, w, uh, vh, z, eta, xmom_update, \
                                 ymom_update)
     else:
-        manning_friction_old(g, eps, w, uh, vh, z, eta, xmom_update, \
+        manning_friction_flat(g, eps, w, uh, vh, z, eta, xmom_update, \
                                 ymom_update)
     
@@ -1190 +1189 @@
     """
 
-    from shallow_water_ext import manning_friction_old
-    from shallow_water_ext import manning_friction_new
+    from shallow_water_ext import manning_friction_flat
+    from shallow_water_ext import manning_friction_sloped
 
     xmom = domain.quantities['xmomentum']
@@ -1210 +1209 @@
     eps = domain.minimum_allowed_height
 
-    if domain.use_new_mannings:
-        manning_friction_new(domain.g, eps, x, w, uh, vh, z, eta, xmom_update, \
+    if domain.use_sloped_mannings:
+        manning_friction_sloped(domain.g, eps, x, w, uh, vh, z, eta, xmom_update, \
                             ymom_update)
     else:
-        manning_friction_old(domain.g, eps, w, uh, vh, z, eta, xmom_update, \
+        manning_friction_flat(domain.g, eps, w, uh, vh, z, eta, xmom_update, \
                             ymom_update)
 

trunk/anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -519 +519 @@
 
 
-void _manning_friction_old(double g, double eps, int N,
+void _manning_friction_flat(double g, double eps, int N,
                double* w, double* zv,
                double* uh, double* vh,
@@ -552 +552 @@
 
 
-void _manning_friction_new(double g, double eps, int N,
+void _manning_friction_sloped(double g, double eps, int N,
                            double* x, double* w, double* zv,
                            double* uh, double* vh,
@@ -1145 +1145 @@
 
 
-PyObject *manning_friction_new(PyObject *self, PyObject *args) {
+PyObject *manning_friction_sloped(PyObject *self, PyObject *args) {
   //
-  // manning_friction_new(g, eps, x, h, uh, vh, z, eta, xmom_update, ymom_update)
+  // manning_friction_sloped(g, eps, x, h, uh, vh, z, eta, xmom_update, ymom_update)
   //
 
@@ -1173 +1173 @@
   N = w -> dimensions[0];
 
-  _manning_friction_new(g, eps, N,
+  _manning_friction_sloped(g, eps, N,
                         (double*) x -> data,
                         (double*) w -> data,
@@ -1229 +1229 @@
 
 
-PyObject *manning_friction_old(PyObject *self, PyObject *args) {
+PyObject *manning_friction_flat(PyObject *self, PyObject *args) {
   //
-  // manning_friction_old(g, eps, h, uh, vh, z, eta, xmom_update, ymom_update)
+  // manning_friction_flat(g, eps, h, uh, vh, z, eta, xmom_update, ymom_update)
   //
 
@@ -1256 +1256 @@
   N = w -> dimensions[0];
 
-  _manning_friction_old(g, eps, N,
+  _manning_friction_flat(g, eps, N,
                         (double*) w -> data,
                         (double*) z -> data,
@@ -2896 +2896 @@
   {"compute_fluxes_ext_kinetic", compute_fluxes_ext_kinetic, METH_VARARGS, "Print out"},
   {"gravity", gravity, METH_VARARGS, "Print out"},
-  {"manning_friction_old", manning_friction_old, METH_VARARGS, "Print out"},
-  {"manning_friction_new", manning_friction_new, METH_VARARGS, "Print out"},
+  {"manning_friction_flat", manning_friction_flat, METH_VARARGS, "Print out"},
+  {"manning_friction_sloped", manning_friction_sloped, METH_VARARGS, "Print out"},
   {"chezy_friction", chezy_friction, METH_VARARGS, "Print out"},
   {"flux_function_central", flux_function_central, METH_VARARGS, "Print out"},  

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

@@ -1772 +1772 @@
 
     def test_manning_friction(self):
+        """ Assuming flat manning frinction is default
+        """
         from anuga.config import g
 
@@ -1848 +1850 @@
 
 
-    def test_manning_friction_old(self):
+    def test_flat_manning_friction(self):
         from anuga.config import g
 
@@ -1864 +1866 @@
         domain = Domain(points, vertices)
 
+        # Use the flat function which doesn't takes into account the extra
+        # wetted area due to slope of bed
+        domain.set_sloped_mannings_function(False)
+
         #Set up for a gradient of (3,0) at mid triangle (bce)
         def slope(x, y):
@@ -1924 +1930 @@
 
 
-    def test_manning_friction_new(self):
+    def test_sloped_manning_friction(self):
         from anuga.config import g
 
@@ -1940 +1946 @@
         domain = Domain(points, vertices)
 
-        # Use the new function which takes into account the extra
+        # Use the sloped 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)