Changeset 5529

Timestamp:

Jul 18, 2008, 12:31:35 PM (17 years ago)

Author:

ole

Message:

Verified that pointer fix works on Linux. All tests pass and boxing day example appears to work (inasmuch as it doesn't segfault anymore).
I have not looked for memory leaks.

Location:

anuga_core/source/anuga/shallow_water

Files:

• test_data_manager.py (modified) (1 diff)
• urs_ext.c (modified) (10 diffs)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -8891 +8891 @@
 if __name__ == "__main__":
 
-    suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sts0')
+    suite = unittest.makeSuite(Test_Data_Manager,'test')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sts0')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_export_gridII')
-#    suite = unittest.makeSuite(Test_Data_Manager,'test_screen_catcher')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_get_flow_through_cross_section_with_geo')
     #suite = unittest.makeSuite(Test_Data_Manager,'covered_')

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -63 +63 @@
     int num_ts;
     
-    printf("Checkpoint 1 for urs2sts_ext.c\n");
+    //printf("Checkpoint 1 for urs2sts_ext.c\n");
 
     // Convert Python arguments to C
@@ -106 +106 @@
     }
 
-    printf("Checkpoint 2 for urs2sts_ext.c\n");    
+    //printf("Checkpoint 2 for urs2sts_ext.c\n");    
     for (i = 0; i < numSrc; i++)
     {
-        printf("Checkpoint 2.1 for urs2sts_ext.c\n");        
         
         fname = PyList_GetItem(filenames, i);
@@ -122 +121 @@
         {
             printf("ERROR: Memory for muxFileNameArray could not be allocated.\n");
-            exit(-1);
-        }
-    }
-
-    printf("Checkpoint 3 for urs2sts_ext.c\n");        
+            return NULL;
+        }
+    }
+
+    //printf("Checkpoint 3 for urs2sts_ext.c\n");        
     if (file_params->nd != 1 || file_params->descr->type_num != PyArray_DOUBLE) 
     {
@@ -134 +133 @@
     }
 
-    printf("Checkpoint 4 for urs2sts_ext.c\n");        
+    //printf("Checkpoint 4 for urs2sts_ext.c\n");        
     // Create array for weights which are passed to read_mux2
     weights = (float*) malloc((int)numSrc*sizeof(float));
@@ -142 +141 @@
     }
     
-    printf("Checkpoint 5 for urs2sts_ext.c\n");            
+    //printf("Checkpoint 5 for urs2sts_ext.c\n");            
     // Read in mux2 data from file
     cdata = _read_mux2((int)numSrc, muxFileNameArray, weights, (double*)file_params->data, (int)verbose);
 
-    printf("Checkpoint 6 for urs2sts_ext.c\n");                
+    //printf("Checkpoint 6 for urs2sts_ext.c\n");                
     // Allocate space for return vector
     nsta0 = (int)*(double*)(file_params->data + 0*file_params->strides[0]);
@@ -152 +151 @@
     nt = (int)*(double*)(file_params->data + 2*file_params->strides[0]);
 
-    printf("Checkpoint 7 for urs2sts_ext.c\n");                    
+    //printf("Checkpoint 7 for urs2sts_ext.c\n");                    
     // Find min and max start times of all gauges
     start_tstep = nt + 1;
@@ -168 +167 @@
     }
 
-    printf("Checkpoint 8 for urs2sts_ext.c\n");                        
+    //printf("Checkpoint 8 for urs2sts_ext.c\n");                        
     if ((start_tstep > nt) | (finish_tstep < 0))
     {
@@ -191 +190 @@
     }
 
-    printf("Checkpoint 9 for urs2sts_ext.c\n");                            
+    //printf("Checkpoint 9 for urs2sts_ext.c\n");                            
     // Each gauge begins and ends recording at different times. When a gauge is
     // not recording but at least one other gauge is. Pad the non-recording gauge
@@ -221 +220 @@
     }
 
-    printf("Checkpoint 10 for urs2sts_ext.c\n");                                
+    //printf("Checkpoint 10 for urs2sts_ext.c\n");                                
     free(weights);
     
-    /*
-    for (i = 0; i < numSrc; ++i)
-    {
-        free(muxFileNameArray[i]);
-        }*/
+    // Free filename array, but not independent Python strings
+    // FIXME(Ole): Do we need to update a reference counter in this case?
     free(muxFileNameArray);
     
@@ -237 +233 @@
     free(cdata);
 
-    printf("Checkpoint 11 for urs2sts_ext.c\n");                                    
+    //printf("Checkpoint 11 for urs2sts_ext.c\n");                                    
     return  PyArray_Return(pydata);
 }