Changeset 998 for inundation/ga/storm_surge/pyvolution/shallow_water_ext.c

Timestamp:

Mar 4, 2005, 11:51:07 AM (20 years ago)

Author:

ole

Message:

Playing with h_limiter

File:

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

inundation/ga/storm_surge/pyvolution/shallow_water_ext.c

@@ -261 +261 @@
         wv[k3+i] = zv[k3+i] + (1-alpha)*hvbar[k3+i] + alpha*hv[k3+i];
             
-      
         //Update momentum as a linear combination of 
         //xmomc and ymomc (shallow) and momentum
@@ -772 +771 @@
   dimensions[0] = N;
   dimensions[1] = 3;  
-  hvbar = (PyArrayObject *) PyArray_FromDims(2, dimensions, PyArray_DOUBLE);
-
-  
+  //hvbar = (PyArrayObject *) PyArray_FromDims(2, dimensions, PyArray_DOUBLE);
+ 
 
   //Find min and max of this and neighbour's centroid values
@@ -787 +785 @@
     for (i=0; i<3; i++) {
       n = ((long*) neighbours -> data)[k3+i];
-      ((double*) hvbar -> data)[k3+i] = ((double*) hc -> data)[k];  
+      //((double*) hvbar -> data)[k3+i] = ((double*) hc -> data)[k];  
       if (n >= 0) {
         hn = ((double*) hc -> data)[n]; //Neighbour's centroid value
@@ -799 +797 @@
   
   // Call underlying routine
-  _limit(N, beta_h, (double*) hc -> data, (double*) hvbar -> data, hmin, hmax);
+  _limit(N, beta_h, (double*) hc -> data, (double*) hv -> data, hmin, hmax);
          
   // // //Py_DECREF(domain); //FIXME: NEcessary?         
@@ -806 +804 @@
   
   //return result using PyArray to avoid memory leak  
-  return PyArray_Return(hvbar);
+  //return PyArray_Return(hvbar);
+  return Py_BuildValue("");    
 }