Changeset 765

Timestamp:

Jan 20, 2005, 5:19:34 PM (20 years ago)

Author:

ole

Message:

Quashed last 64 bit bug (changed int* to long* in integer arrays)

Location:

inundation/ga/storm_surge/pyvolution

Files:

• quantity_ext.c (modified) (2 diffs)
• test_quantity.py (modified) (1 diff)
• test_shallow_water.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/quantity_ext.c

@@ -574 +574 @@
   Py_DECREF(domain);      
 
-  //qc = (PyArrayObject*) PyObject_GetAttrString(quantity, "centroid_values"); 
-  //qv = (PyArrayObject*) PyObject_GetAttrString(quantity, "vertex_values");   
+
   qc = get_consecutive_array(quantity, "centroid_values"); 
   qv = get_consecutive_array(quantity, "vertex_values");   
@@ -592 +591 @@
     
     for (i=0; i<3; i++) {
-      n = ((int*) neighbours -> data)[k3+i];
+      n = ((long*) neighbours -> data)[k3+i];
       if (n >= 0) {
         qn = ((double*) qc -> data)[n]; //Neighbour's centroid value

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -900 +900 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(TestCase,'test')
+    suite = unittest.makeSuite(TestCase,'test_limiter2')
     #print "restricted test"
     #suite = unittest.makeSuite(TestCase,'test_set_vertex_values_subset')

inundation/ga/storm_surge/pyvolution/test_shallow_water.py

@@ -1199 +1199 @@
         domain.order = 1        
         domain.distribute_to_vertices_and_edges()
-        print L[1]        
         assert allclose(L[1], val1)
         
@@ -1205 +1204 @@
         domain.order = 2        
         domain.distribute_to_vertices_and_edges()
-        print L[1]
         assert allclose(L[1], [2.2, 4.9, 4.9])
                 
@@ -2372 +2370 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(TestCase,'test_distribute_basic')
+    suite = unittest.makeSuite(TestCase,'test')
     #suite = unittest.makeSuite(TestCase,'test_boundary_conditionsII')
     runner = unittest.TextTestRunner()