Changeset 766

Timestamp:

Jan 21, 2005, 10:53:26 AM (19 years ago)

Author:

ole

Message:

Cleanup

File:

• inundation/ga/storm_surge/pyvolution/quantity_ext.c (modified) (8 diffs)

inundation/ga/storm_surge/pyvolution/quantity_ext.c

@@ -176 +176 @@
     x = centroid_values[k];
     if (x == 0.0) {
-      //FIXME: Is this right
       semi_implicit_update[k] = 0.0;
     } else {
@@ -222 +221 @@
   explicit_update = get_consecutive_array(quantity, "explicit_update");   
   semi_implicit_update = get_consecutive_array(quantity, "semi_implicit_update");     
-  
-  
-  //centroid_values = (PyArrayObject*) 
-  //  PyObject_GetAttrString(quantity, "centroid_values");           
-  //if (!centroid_values) return NULL;                
-
-  //explicit_update = (PyArrayObject*) 
-  //  PyObject_GetAttrString(quantity, "explicit_update");   
-  //if (!explicit_update) return NULL;          
-  
-  //semi_implicit_update = (PyArrayObject*) 
-  //  PyObject_GetAttrString(quantity, "semi_implicit_update");   
-  //if (!semi_implicit_update) return NULL;            
 
   N = centroid_values -> dimensions[0];  
@@ -274 +260 @@
   edge_values = get_consecutive_array(quantity, "edge_values");  
   
-  /*  
-  vertex_values = (PyArrayObject*) 
-    PyObject_GetAttrString(quantity, "vertex_values");           
-  if (!vertex_values) return NULL;                
-
-  edge_values = (PyArrayObject*) 
-    PyObject_GetAttrString(quantity, "edge_values");   
-  if (!edge_values) return NULL;          
-  */
-
   N = vertex_values -> dimensions[0];  
   
@@ -330 +306 @@
   number_of_boundaries = get_consecutive_array(domain, "number_of_boundaries");
 
-  //centroids = (PyArrayObject*) 
-  //  PyArray_ContiguousFromObject(
-  //                             PyObject_GetAttrString(domain, "centroid_coordinates"),
-  //                             PyArray_DOUBLE, 0, 0);
-    //  if (!centroids) return NULL;    
-  
-  /*
-  centroid_values = (PyArrayObject*) 
-    PyArray_ContiguousFromObject(
-                                 PyObject_GetAttrString(quantity, 
-                                                        "centroid_values"),
-                                 PyArray_DOUBLE, 0, 0);
-  if (!centroid_values) return NULL;       
-  */ 
-  
-  /*
-  surrogate_neighbours = (PyArrayObject*) 
-    PyArray_ContiguousFromObject(
-                                 PyObject_GetAttrString(domain, "surrogate_neighbours"),
-                                 PyArray_LONG, 0, 0);                            
-  if (!surrogate_neighbours) return NULL;        
-  
-  number_of_boundaries = (PyArrayObject*) 
-    PyArray_ContiguousFromObject(
-                                 PyObject_GetAttrString(domain, "number_of_boundaries"),
-                                 PyArray_LONG, 0, 0);                            
-  if (!number_of_boundaries) return NULL;            
-
-  */
-  
   N = centroid_values -> dimensions[0];
     
@@ -432 +378 @@
   vertex_values = get_consecutive_array(quantity, "vertex_values");      
   
-  
-  /*
-  centroids = (PyArrayObject*) 
-    PyArray_ContiguousFromObject(
-                                 PyObject_GetAttrString(domain, "centroid_coordinates"),
-                                 PyArray_DOUBLE, 0, 0);
-  if (!centroids) return NULL;    
-  
-  
-  centroid_values = (PyArrayObject*)
-    PyArray_ContiguousFromObject( 
-                                 PyObject_GetAttrString(quantity, "centroid_values"),
-                                 PyArray_DOUBLE, 0, 0);
-  if (!centroid_values) return NULL;        
-  
-  surrogate_neighbours = (PyArrayObject*) 
-    PyArray_ContiguousFromObject( 
-                                 PyObject_GetAttrString(domain, "surrogate_neighbours"),
-                                 PyArray_LONG, 0, 0);
-  if (!surrogate_neighbours) return NULL;        
-  
-  number_of_boundaries = (PyArrayObject*) 
-    PyArray_ContiguousFromObject( 
-                                 PyObject_GetAttrString(domain, "number_of_boundaries"),
-                                 PyArray_LONG, 0, 0);
-  if (!number_of_boundaries) return NULL;            
-  
-  vertex_coordinates = (PyArrayObject*) 
-    PyArray_ContiguousFromObject( 
-                                 PyObject_GetAttrString(domain, "vertex_coordinates"),
-                                 PyArray_DOUBLE, 0, 0);
-  if (!vertex_coordinates) return NULL;              
-  
-  vertex_values = (PyArrayObject*)
-    PyArray_ContiguousFromObject(  
-                                 PyObject_GetAttrString(quantity, "vertex_values"),
-                                 PyArray_DOUBLE, 0, 0);
-  if (!vertex_values) return NULL;                
-  */
-  
-
-  
-  
   N = centroid_values -> dimensions[0];
     
@@ -513 +416 @@
                      (double*) a -> data,
                      (double*) b -> data);                   
-  //a, b);
                      
                      
@@ -533 +435 @@
   Py_DECREF(a);                   
   Py_DECREF(b);                     
-  //free(a);      
-  //free(b);        
   
   return Py_BuildValue("");    
@@ -621 +521 @@
    interpolate_from_vertices_to_edges,
    METH_VARARGS, "Print out"},           
-  {NULL, NULL, 0, NULL}   /* sentinel */
+  {NULL, NULL, 0, NULL}   // sentinel
 };