Changeset 7783

Timestamp:

Jun 5, 2010, 7:03:43 PM (15 years ago)

Author:

steve

Message:

cleaning up shallow water domain

File:

• anuga_work/development/pipeflow/sww_comp_flux_ext.c (copied) (copied from anuga_work/development/pipeflow/comp_flux_ext.c) (5 diffs)

anuga_work/development/pipeflow/sww_comp_flux_ext.c

@@ -168 +168 @@
 //=========================================================================
 PyObject *compute_fluxes_ext(PyObject *self, PyObject *args) {
-  
-    PyArrayObject 
-        *neighbours, 
+
+    PyObject
+        *domain,
+        *stage,
+        *xmom,
+        *bed,
+        *height,
+        *velocity;
+
+    PyArrayObject
+        *neighbours,
         *neighbour_vertices,
-        *normals, 
+        *normals,
         *areas,
         *stage_vertex_values,
@@ -188 +196 @@
         *max_speed_array;
 
-    
-    double timestep, epsilon, g, h0, cfl;
-    int number_of_elements;
-    
-    // Convert Python arguments to C
-    if (!PyArg_ParseTuple(args, "dddddOOOOOOOOOOOOOOOOiO",
-                          &cfl,
-                          &timestep,
-                          &epsilon,
-                          &g,
-                          &h0,
-                          &neighbours,
-                          &neighbour_vertices,
-                          &normals,
-                          &areas,
-                          &stage_vertex_values,
-                          &xmom_vertex_values,
-                          &bed_vertex_values,
-                          &height_vertex_values,
-                          &velocity_vertex_values,
-                          &stage_boundary_values,
-                          &xmom_boundary_values,
-                          &bed_boundary_values,
-                          &height_boundary_values,
-                          &velocity_boundary_values,
-                          &stage_explicit_update,
-                          &xmom_explicit_update,
-                          &number_of_elements,
-                          &max_speed_array)) {
-        PyErr_SetString(PyExc_RuntimeError, "comp_flux_ext.c: compute_fluxes_ext could not parse input");
-        return NULL;
-    }
-
-
-    // Call underlying flux computation routine and update 
-    // the explicit update arrays 
+  double timestep, epsilon, g, h0, cfl;
+  int number_of_elements;
+
+
+  // Convert Python arguments to C
+  if (!PyArg_ParseTuple(args, "dOOOOOO",
+                        &timestep,
+                        &domain,
+                        &stage,
+                        &xmom,
+                        &bed,
+                        &height,
+                        &velocity)) {
+      PyErr_SetString(PyExc_RuntimeError, "comp_flux_ext.c: compute_fluxes_ext_short could not parse input");
+      return NULL;
+  }
+
+
+    epsilon           = get_python_double(domain,"epsilon");
+    g                 = get_python_double(domain,"g");
+    h0                = get_python_double(domain,"h0");
+    cfl               = get_python_double(domain,"cfl");
+
+
+    neighbours        = get_consecutive_array(domain, "neighbours");
+    neighbour_vertices= get_consecutive_array(domain, "neighbour_vertices");
+    normals           = get_consecutive_array(domain, "normals");
+    areas             = get_consecutive_array(domain, "areas");
+    max_speed_array   = get_consecutive_array(domain, "max_speed_array");
+
+    stage_vertex_values      = get_consecutive_array(stage,    "vertex_values");
+    xmom_vertex_values       = get_consecutive_array(xmom,     "vertex_values");
+    bed_vertex_values        = get_consecutive_array(bed,      "vertex_values");
+    height_vertex_values     = get_consecutive_array(height,   "vertex_values");
+    velocity_vertex_values   = get_consecutive_array(velocity, "vertex_values");
+
+    stage_boundary_values     = get_consecutive_array(stage,     "boundary_values");
+    xmom_boundary_values      = get_consecutive_array(xmom,      "boundary_values");
+    bed_boundary_values       = get_consecutive_array(bed,       "boundary_values");
+    height_boundary_values    = get_consecutive_array(height,    "boundary_values");
+    velocity_boundary_values  = get_consecutive_array(velocity,  "boundary_values");
+
+
+    stage_explicit_update = get_consecutive_array(stage, "explicit_update");
+    xmom_explicit_update  = get_consecutive_array(xmom,  "explicit_update");
+
+    number_of_elements = stage_vertex_values -> dimensions[0];
+
+    // Call underlying flux computation routine and update
+    // the explicit update arrays
     timestep = _compute_fluxes_ext(
         cfl,
@@ -250 +272 @@
 
 
-    // Return updated flux timestep
-    return Py_BuildValue("d", timestep);
-}
-
-
-PyObject *compute_fluxes_ext_short(PyObject *self, PyObject *args) {
-  
-    PyObject 
-        *domain,
-        *stage, 
-        *xmom, 
-        *bed,
-        *height,
-        *velocity;
-
-    PyArrayObject 
-        *neighbours, 
-        *neighbour_vertices,
-        *normals, 
-        *areas,
-        *stage_vertex_values,
-        *xmom_vertex_values,
-        *bed_vertex_values,
-        *height_vertex_values,
-        *velocity_vertex_values,
-        *stage_boundary_values,
-        *xmom_boundary_values,
-        *bed_boundary_values,
-        *height_boundary_values,
-        *velocity_boundary_values,
-        *stage_explicit_update,
-        *xmom_explicit_update,
-        *max_speed_array;
-    
-  double timestep, epsilon, g, h0, cfl;
-  int number_of_elements;
-
-    
-  // Convert Python arguments to C
-  if (!PyArg_ParseTuple(args, "dOOOOOO",
-                        &timestep,
-                        &domain,
-                        &stage,
-                        &xmom,
-                        &bed,
-                        &height,
-                        &velocity)) {
-      PyErr_SetString(PyExc_RuntimeError, "comp_flux_ext.c: compute_fluxes_ext_short could not parse input");
-      return NULL;
-  }
-
-
-    epsilon           = get_python_double(domain,"epsilon");
-    g                 = get_python_double(domain,"g");
-    h0                = get_python_double(domain,"h0");
-    cfl               = get_python_double(domain,"cfl");
- 
-    
-    neighbours        = get_consecutive_array(domain, "neighbours");
-    neighbour_vertices= get_consecutive_array(domain, "neighbour_vertices"); 
-    normals           = get_consecutive_array(domain, "normals");
-    areas             = get_consecutive_array(domain, "areas");    
-    max_speed_array   = get_consecutive_array(domain, "max_speed_array");
-    
-    stage_vertex_values      = get_consecutive_array(stage,    "vertex_values");    
-    xmom_vertex_values       = get_consecutive_array(xmom,     "vertex_values");    
-    bed_vertex_values        = get_consecutive_array(bed,      "vertex_values");    
-    height_vertex_values     = get_consecutive_array(height,   "vertex_values");    
-    velocity_vertex_values   = get_consecutive_array(velocity, "vertex_values");    
-
-    stage_boundary_values     = get_consecutive_array(stage,     "boundary_values");    
-    xmom_boundary_values      = get_consecutive_array(xmom,      "boundary_values");    
-    bed_boundary_values       = get_consecutive_array(bed,       "boundary_values");    
-    height_boundary_values    = get_consecutive_array(height,    "boundary_values");    
-    velocity_boundary_values  = get_consecutive_array(velocity,  "boundary_values");    
-
-
-    stage_explicit_update = get_consecutive_array(stage, "explicit_update");    
-    xmom_explicit_update  = get_consecutive_array(xmom,  "explicit_update");    
-
-    number_of_elements = stage_vertex_values -> dimensions[0];
- 
-    // Call underlying flux computation routine and update 
-    // the explicit update arrays 
-    timestep = _compute_fluxes_ext(
-        cfl,
-        timestep,
-        epsilon,
-        g,
-        h0,
-        (long*) neighbours -> data,
-        (long*) neighbour_vertices -> data,
-        (double*) normals -> data,
-        (double*) areas -> data,
-        (double*) stage_vertex_values -> data,
-        (double*) xmom_vertex_values -> data,
-        (double*) bed_vertex_values -> data,
-        (double*) height_vertex_values -> data,
-        (double*) velocity_vertex_values -> data,
-        (double*) stage_boundary_values -> data,
-        (double*) xmom_boundary_values -> data,
-        (double*) bed_boundary_values -> data,
-        (double*) height_boundary_values -> data,
-        (double*) velocity_boundary_values -> data,
-        (double*) stage_explicit_update -> data,
-        (double*) xmom_explicit_update -> data,
-        number_of_elements,
-        (double*) max_speed_array -> data);
-    
-
   Py_DECREF(neighbours);
   Py_DECREF(neighbour_vertices);
@@ -383 +295 @@
 }
 
+
+
 //-------------------------------
 // Method table for python module
@@ -389 +303 @@
 static struct PyMethodDef MethodTable[] = {
   {"compute_fluxes_ext", compute_fluxes_ext, METH_VARARGS, "Print out"},
-  {"compute_fluxes_ext_short", compute_fluxes_ext_short, METH_VARARGS, "Print out"},
   {NULL, NULL}
 };
 
 // Module initialisation
-void initcomp_flux_ext(void){
-  Py_InitModule("comp_flux_ext", MethodTable);
+void initsww_comp_flux_ext(void){
+  Py_InitModule("sww_comp_flux_ext", MethodTable);
   import_array();
 }