Changeset 4712 for anuga_core/source/anuga/abstract_2d_finite_volumes/quantity_ext.c

Timestamp:

Sep 7, 2007, 10:43:46 PM (16 years ago)

Author:

steve

Message:

Working on 2nd order time stepping

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/quantity_ext.c (modified) (4 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity_ext.c

@@ -100 +100 @@
 
 
+
 int _extrapolate(int N,
                  double* centroids,
@@ -162 +163 @@
         return 0;
 }
+
+int _backup_centroid_values(int N,
+                            double* centroid_values,
+                            double* centroid_backup_values) {
+    //Backup centroid values
+
+
+    int k;
+
+    for (k=0; k<N; k++) {
+        centroid_backup_values[k] = centroid_values[k];
+    }
+
+
+    return 0;
+}
+
+
+int _saxpy_centroid_values(int N,
+                           double a,
+                           double b,
+                           double* centroid_values,
+                           double* centroid_backup_values) {
+    //saxby centroid values
+
+
+    int k;
+
+
+    for (k=0; k<N; k++) {
+        centroid_values[k] = a*centroid_values[k] + b*centroid_backup_values[k];
+    }
+
+
+    return 0;
+}
+
 
 int _update(int N,
@@ -305 +343 @@
 
 
+PyObject *backup_centroid_values(PyObject *self, PyObject *args) {
+
+        PyObject *quantity;
+        PyArrayObject *centroid_values, *centroid_backup_values;
+
+        int N, err;
+
+
+        // Convert Python arguments to C
+        if (!PyArg_ParseTuple(args, "O", &quantity)) {
+          PyErr_SetString(PyExc_RuntimeError, 
+                          "quantity_ext.c: backup_centroid_values could not parse input");
+          return NULL;
+        }
+
+        centroid_values        = get_consecutive_array(quantity, "centroid_values");
+        centroid_backup_values = get_consecutive_array(quantity, "centroid_backup_values");
+
+        N = centroid_values -> dimensions[0];
+
+        err = _backup_centroid_values(N,
+                      (double*) centroid_values -> data,
+                      (double*) centroid_backup_values -> data);
+
+
+        //Release and return
+        Py_DECREF(centroid_values);
+        Py_DECREF(centroid_backup_values);
+
+        return Py_BuildValue("");
+}
+
+PyObject *saxpy_centroid_values(PyObject *self, PyObject *args) {
+
+        PyObject *quantity;
+        PyArrayObject *centroid_values, *centroid_backup_values;
+
+        double a,b;
+        int N, err;
+
+
+        // Convert Python arguments to C
+        if (!PyArg_ParseTuple(args, "Odd", &quantity, &a, &b)) {
+          PyErr_SetString(PyExc_RuntimeError, 
+                          "quantity_ext.c: saxpy_centroid_values could not parse input");
+          return NULL;
+        }
+
+        centroid_values        = get_consecutive_array(quantity, "centroid_values");
+        centroid_backup_values = get_consecutive_array(quantity, "centroid_backup_values");
+
+        N = centroid_values -> dimensions[0];
+
+        err = _saxpy_centroid_values(N,a,b,
+                      (double*) centroid_values -> data,
+                      (double*) centroid_backup_values -> data);
+
+
+        //Release and return
+        Py_DECREF(centroid_values);
+        Py_DECREF(centroid_backup_values);
+
+        return Py_BuildValue("");
+}
+
+
 PyObject *interpolate_from_vertices_to_edges(PyObject *self, PyObject *args) {
 
@@ -645 +749 @@
         {"limit", limit, METH_VARARGS, "Print out"},
         {"update", update, METH_VARARGS, "Print out"},
+        {"backup_centroid_values", backup_centroid_values, METH_VARARGS, "Print out"},
+        {"saxpy_centroid_values", saxpy_centroid_values, METH_VARARGS, "Print out"},
         {"compute_gradients", compute_gradients, METH_VARARGS, "Print out"},
         {"extrapolate_second_order", extrapolate_second_order,