Changeset 5527

Timestamp:

Jul 18, 2008, 11:33:51 AM (16 years ago)

Author:

ole

Message:

Checked in debug information for urs_ext.c

Location:

anuga_core/source/anuga/shallow_water

Files:

• test_data_manager.py (modified) (2 diffs)
• urs_ext.c (modified) (10 diffs)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -6289 +6289 @@
         assert allclose(yvelocity,va)
 
-    def test_urs2stsI(self):
+    def test_urs2sts0(self):
         """
         Test single source
@@ -8891 +8891 @@
 if __name__ == "__main__":
 
-    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')

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -62 +62 @@
     int time;
     int num_ts;
+    
+    printf("Checkpoint 1 for urs2sts_ext.c\n");
 
     // Convert Python arguments to C
@@ -104 +106 @@
     }
 
+    printf("Checkpoint 2 for urs2sts_ext.c\n");    
     for (i = 0; i < numSrc; i++)
     {
+        printf("Checkpoint 2.1 for urs2sts_ext.c\n");        
         muxFileNameArray[i] = (char*)malloc((MAX_FILE_NAME_LENGTH + 1)*sizeof(char));
         
@@ -114 +118 @@
         }
 
+        printf("Checkpoint 2.2 for urs2sts_ext.c\n");           
         fname = PyList_GetItem(filenames, i);
+        printf("Checkpoint 2.3 for urs2sts_ext.c\n");
+                                
         if (!PyString_Check(fname)) 
         {
             PyErr_SetString(PyExc_ValueError, "filename not a string");
-        }
-
+            return NULL;
+        }
+
+        printf("Checkpoint 2.4 for urs2sts_ext.c\n");                   
         muxFileNameArray[i] = PyString_AsString(fname);
     }
 
+    printf("Checkpoint 3 for urs2sts_ext.c\n");        
     if (file_params->nd != 1 || file_params->descr->type_num != PyArray_DOUBLE) 
     {
@@ -130 +140 @@
     }
 
+    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));
@@ -137 +148 @@
     }
     
+    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");                
     // Allocate space for return vector
     nsta0 = (int)*(double*)(file_params->data + 0*file_params->strides[0]);
@@ -145 +158 @@
     nt = (int)*(double*)(file_params->data + 2*file_params->strides[0]);
 
+    printf("Checkpoint 7 for urs2sts_ext.c\n");                    
     // Find min and max start times of all gauges
     start_tstep = nt + 1;
@@ -160 +174 @@
     }
 
+    printf("Checkpoint 8 for urs2sts_ext.c\n");                        
     if ((start_tstep > nt) | (finish_tstep < 0))
     {
@@ -182 +197 @@
     }
 
+    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
@@ -211 +227 @@
     }
 
+    printf("Checkpoint 10 for urs2sts_ext.c\n");                                
     free(weights);
     
@@ -225 +242 @@
     free(cdata);
 
+    printf("Checkpoint 11 for urs2sts_ext.c\n");                                    
     return  PyArray_Return(pydata);
 }