Changeset 5541 for anuga_core/source/anuga/shallow_water

Timestamp:

Jul 21, 2008, 12:30:26 PM (16 years ago)

Author:

ole

Message:

Resolved 64 bit issue for permutation in urs_ext.c

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (3 diffs)
• urs_ext.c (modified) (8 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4876 +4876 @@
     if permutation is None:
         permutation = ensure_numeric([], Float)    
-        
+
     # Call underlying C implementation urs2sts_ext.c    
     data=read_mux2(numSrc,filenames,weights,file_params,permutation,verbose)
@@ -5061 +5061 @@
         permutation = None
 
-                
+
+    #print 'permutation', permutation
     # Read MUX2 files
     if (verbose): print 'reading mux2 file'

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -6626 +6626 @@
         y = points[:,1]
 
+        #print
+        #print x
+        #print y
         for i, index in enumerate(permutation):
             # Check that STS points are stored in the correct order
@@ -6632 +6635 @@
             zone, e, n = redfearn(lat_long_points[index][0], 
                                   lat_long_points[index][1])             
-            
+
+            #print i, [x[i],y[i]], [e,n]
             assert allclose([x[i],y[i]], [e,n])
             
@@ -8940 +8944 @@
 if __name__ == "__main__":
 
+    #suite = unittest.makeSuite(Test_Data_Manager,'test')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sts_read_mux2_pyI')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sts_read_mux2_pyI')
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sts')
     #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

@@ -33 +33 @@
                    double *params, 
                    int *number_of_stations,
-                   int *permutation,
+                   long *permutation,
                    int verbose);
 
@@ -74 +74 @@
     // Convert Python arguments to C
     if (!PyArg_ParseTuple(args, "iOOOOi",
-                          &numSrc, &filenames, &pyweights, &file_params, &permutation, &verbose)) 
+                          &numSrc, &filenames, &pyweights, &file_params, 
+                          &permutation, &verbose)) 
     {
             PyErr_SetString(PyExc_RuntimeError, 
@@ -155 +156 @@
                        (double*)file_params->data,
                        &number_of_selected_stations, // Desired number of stations
-                       (int*) permutation->data, // Ordering of selected stations
+                       (long*) permutation->data, // Ordering of selected stations
                        verbose);
 
@@ -207 +208 @@
     dimensions[0] = number_of_selected_stations;
     dimensions[1] = num_ts + POFFSET;
+    
     pydata = (PyArrayObject*)PyArray_FromDims(2, dimensions, PyArray_DOUBLE);
     if(pydata == NULL)
@@ -264 +266 @@
                    double *params, 
                    int *number_of_stations,
-                   int *permutation,
+                   long *permutation,
                    int verbose)
 {
@@ -404 +406 @@
       
         // Create the Identity permutation vector
-        permutation = (int *) malloc(number_of_selected_stations*sizeof(int));
+        permutation = (long *) malloc(number_of_selected_stations*sizeof(long));
         for (i = 0; i < number_of_selected_stations; i++)
         {
-          permutation[i] = i;  
-        }
-    }
-    
-    
+          permutation[i] = (long) i;  
+        }
+    }
+    
+    /*
+    printf("number_of_selected_stations = %d\n", number_of_selected_stations);
+    for (i = 0; i < number_of_selected_stations; i++) {
+      printf("permutation[%d] = %d\n", i, (int) permutation[i]);
+    }    
+    */
+    
+        
     
     /* Make array(s) to hold demuxed data for stations given in the permutation file */
@@ -433 +442 @@
         }
 
-        ista = permutation[i]; // Get global index into mux data
+        ista = (int) permutation[i]; // Get global index into mux data
         
         sts_data[i][mytgs0[0].nt] = (float)mytgs0[ista].geolat;
@@ -477 +486 @@
         {               
         
-            ista = permutation[i]; // Get global index into mux data    
+            ista = (int) permutation[i]; // Get global index into mux data      
             
             /* fill the data0 array from the mux file, and weight it */