Changeset 502

Timestamp:

Nov 8, 2004, 6:32:55 PM (20 years ago)

Author:

ole

Message:

Changed from level to height in friction

File:

• inundation/ga/storm_surge/pyvolution/shallow_water_ext.c (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/shallow_water_ext.c

@@ -156 +156 @@
         
 void _manning_friction(double g, double eps, int N, 
-                       double* w, double* uh, double* vh, 
+                       double* h, double* uh, double* vh, 
                        double* eta, double* xmom, double* ymom) {     
 
@@ -163 +163 @@
   
   for (k=0; k<N; k++) {
-    if (w[k] >= eps) {
+    if (h[k] >= eps) {
       S = -g * eta[k]*eta[k] * sqrt((uh[k]*uh[k] + vh[k]*vh[k]));
-      S /= pow(w[k], 7.0/3);      
+      S /= pow(h[k], 7.0/3);      
 
       //Update momentum
@@ -340 +340 @@
 PyObject *manning_friction(PyObject *self, PyObject *args) {
   //
-  // manning_friction(g, eps, w, uh, vh, eta, xmom_update, ymom_update)
-  //
-  
-  
-  PyArrayObject *w, *uh, *vh, *eta, *xmom, *ymom;
+  // manning_friction(g, eps, h, uh, vh, eta, xmom_update, ymom_update)
+  //
+  
+  
+  PyArrayObject *h, *uh, *vh, *eta, *xmom, *ymom;
   int N;
   double g, eps;
     
   if (!PyArg_ParseTuple(args, "ddOOOOOO",
-                        &g, &eps, &w, &uh, &vh, &eta, 
+                        &g, &eps, &h, &uh, &vh, &eta, 
                         &xmom, &ymom))  
     return NULL;  
 
-  N = w -> dimensions[0];    
+  N = h -> dimensions[0];    
   _manning_friction(g, eps, N,
-                    (double*) w -> data,
+                    (double*) h -> data,
                     (double*) uh -> data, 
                     (double*) vh -> data,