Changeset 7782 for anuga_work/development/pipeflow/swb_comp_flux_ext.c

Timestamp:

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

Author:

steve

Message:

cleaning up shallow water domain

File:

• anuga_work/development/pipeflow/swb_comp_flux_ext.c (copied) (copied from anuga_work/development/pipeflow/comp_flux_ext_wellbalanced.c) (11 diffs)

anuga_work/development/pipeflow/swb_comp_flux_ext.c

@@ -7 +7 @@
 
 //Innermost flux function (using w=z+h)
-int _flux_function_wellbalanced(double *q_left, 
+int _flux_function(double *q_left, 
                                                                 double *q_right,
                                                                 double normals, 
@@ -15 +15 @@
                                                                 double *max_speed) {            
                 int i;
-        double z_left, z_right;
+                double z_left, z_right;
                 double flux_left[2], flux_right[2];
                 double z_star, w_left, h_left, h_left_star, uh_left, soundspeed_left, u_left;
@@ -24 +24 @@
                 uh_left = q_left[1];
                 uh_left = uh_left*normals;
-        z_left  = q_left[2];
+                z_left  = q_left[2];
                 h_left  = q_left[3];
                 u_left  = q_left[4];
@@ -31 +31 @@
                 uh_right = q_right[1];
                 uh_right = uh_right*normals;
-        z_right  = q_right[2];
+                z_right  = q_right[2];
                 h_right  = q_right[3];
                 u_right  = q_right[4];
@@ -108 +108 @@
         
 // Computational function for flux computation
-double _compute_fluxes_ext_wellbalanced(double timestep,
+double _compute_fluxes_ext(double timestep,
                 double epsilon,
                 double g,
@@ -152 +152 @@
                                 ql[1] = xmom_edge_values[ki];
                                 ql[2] = bed_edge_values[ki];
-                ql[3] = height_edge_values[ki];
+                                ql[3] = height_edge_values[ki];
                                 ql[4] = vel_edge_values[ki];
                 
@@ -176 +176 @@
                                 
                                 normal = normals[ki];
-                                _flux_function_wellbalanced(ql, qr, normal, g, epsilon, edgeflux, &max_speed);
+                                _flux_function(ql, qr, normal, g, epsilon, edgeflux, &max_speed);
                                 flux[0] -= edgeflux[0];
                                 flux[1] -= edgeflux[1];
@@ -209 +209 @@
 // Python Glue
 //=========================================================================
-PyObject *compute_fluxes_ext_wellbalanced(PyObject *self, PyObject *args) {
+PyObject *compute_fluxes_ext(PyObject *self, PyObject *args) {
   
     PyArrayObject 
@@ -271 +271 @@
                         &number_of_elements,
                         &max_speed_array)) {
-    PyErr_SetString(PyExc_RuntimeError, "comp_flux_ext_wellbalanced.c: compute_fluxes_ext_wellbalanced could not parse input");
+    PyErr_SetString(PyExc_RuntimeError, "swb_comp_flux_ext.c: compute_fluxes_ext could not parse input");
     return NULL;
   }
@@ -278 +278 @@
   // Call underlying flux computation routine and update 
   // the explicit update arrays 
-  timestep = _compute_fluxes_ext_wellbalanced(timestep,
+  timestep = _compute_fluxes_ext(timestep,
                                  epsilon,
                                  g,
@@ -319 +319 @@
 
 static struct PyMethodDef MethodTable[] = {
-  {"compute_fluxes_ext_wellbalanced", compute_fluxes_ext_wellbalanced, METH_VARARGS, "Print out"},
+  {"compute_fluxes_ext", compute_fluxes_ext, METH_VARARGS, "Print out"},
   {NULL, NULL}
 };
 
 // Module initialisation
-void initcomp_flux_ext_wellbalanced(void){
-  Py_InitModule("comp_flux_ext_wellbalanced", MethodTable);
+void initswb_comp_flux_ext(void){
+  Py_InitModule("swb_comp_flux_ext", MethodTable);
   import_array();
 }