Changeset 8948

Timestamp:

Aug 4, 2013, 6:40:15 PM (11 years ago)

Author:

steve

Message:

Changed some function names in the C code so they are different. Seems the mac has a tendency to pull in the wrong objects!

File:

• trunk/anuga_core/source/anuga/shallow_water/swb2_domain_ext.c (modified) (6 diffs)

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

@@ -1283 +1283 @@
 // Modified central flux function
 
-PyObject *compute_fluxes_ext_central(PyObject *self, PyObject *args) {
+PyObject *swb2_compute_fluxes_ext_central(PyObject *self, PyObject *args) {
   /*Compute all fluxes and the timestep suitable for all volumes
     in domain.
@@ -1453 +1453 @@
 
 
-PyObject *flux_function_central(PyObject *self, PyObject *args) {
+PyObject *swb2_flux_function_central(PyObject *self, PyObject *args) {
   //
   // Gateway to innermost flux function.
@@ -1500 +1500 @@
 //========================================================================
 
-PyObject *gravity(PyObject *self, PyObject *args) {
+PyObject *swb2_gravity(PyObject *self, PyObject *args) {
   //
   //  gravity(g, h, v, x, xmom, ymom)
@@ -1568 +1568 @@
 
 
-PyObject *extrapolate_second_order_edge_sw(PyObject *self, PyObject *args) {
+PyObject *swb2_extrapolate_second_order_edge_sw(PyObject *self, PyObject *args) {
   /*Compute the edge values based on a linear reconstruction 
     on each triangle
@@ -1719 +1719 @@
 //========================================================================
 
-PyObject *protect(PyObject *self, PyObject *args) {
+PyObject *swb2_protect(PyObject *self, PyObject *args) {
   //
   //    protect(minimum_allowed_height, maximum_allowed_speed, wc, zc, xmomc, ymomc)
@@ -1775 +1775 @@
    */
   //{"rotate", (PyCFunction)rotate, METH_VARARGS | METH_KEYWORDS, "Print out"},
-  {"compute_fluxes_ext_central", compute_fluxes_ext_central, METH_VARARGS, "Print out"},
-  {"gravity_c",        gravity,            METH_VARARGS, "Print out"},
-  {"flux_function_central", flux_function_central, METH_VARARGS, "Print out"},  
-  {"extrapolate_second_order_edge_sw", extrapolate_second_order_edge_sw, METH_VARARGS, "Print out"},
-  {"protect",          protect, METH_VARARGS | METH_KEYWORDS, "Print out"},
+  {"compute_fluxes_ext_central", swb2_compute_fluxes_ext_central, METH_VARARGS, "Print out"},
+  {"gravity_c",        swb2_gravity,            METH_VARARGS, "Print out"},
+  {"flux_function_central", swb2_flux_function_central, METH_VARARGS, "Print out"},
+  {"extrapolate_second_order_edge_sw", swb2_extrapolate_second_order_edge_sw, METH_VARARGS, "Print out"},
+  {"protect",          swb2_protect, METH_VARARGS | METH_KEYWORDS, "Print out"},
   {NULL, NULL, 0, NULL}
 };