Changeset 5935 for anuga_core/source/anuga/shallow_water

Timestamp:

Nov 11, 2008, 10:00:14 AM (16 years ago)

Author:

ole

Message:

Committed work on platform problem with mux reader

Location:

anuga_core/source/anuga/shallow_water

Files:

• test_data_manager.py (modified) (6 diffs)
• urs_ext.c (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -6527 +6527 @@
 
         for j, file in enumerate(filesII):
+            # Read stage, u, v enumerated as j
+
+            if j < 2:
+                continue
+            
             data = read_mux2(1, [file], weights, file_params, permutation, verbose)
 
-            #print 
-            #print 'j:', j
-            #print data[2][:]
+            print
+            print 'Data received by Python'
+            print data
             #print file_params
-            #print
-
+            print
+
+            import sys; sys.exit()
+            
             number_of_selected_stations = data.shape[0]
 
@@ -6549 +6556 @@
                 #print quantity[i][:]
 
-
+                
                 if j == 0: assert allclose(data[i][:parameters_index], ha1[permutation[i], :])
                 if j == 1: assert allclose(data[i][:parameters_index], ua1[permutation[i], :])
@@ -6555 +6562 @@
                     # FIXME (Ole): This is where the output is wrong on Win32
                     
-                    #print
-                    #print j, i
-                    #print data[i][:parameters_index]
-                    #print va1[permutation[i], :]
+                    print
+                    print j, i
+
+                    print 'Input'
+                    print 'u', ua1[permutation[i], :]                                        
+                    print 'v', va1[permutation[i], :]
+
+                    print 'Output'
+                    print 'v ', data[i][:parameters_index]                    
 
                     if j == 2 and i == 1:
@@ -6564 +6576 @@
                         # Skip assert for this combination for now as the second error is more obvious
                     else:
+                        
                         assert allclose(data[i][:parameters_index], va1[permutation[i], :])
                     
@@ -10910 +10923 @@
 if __name__ == "__main__":
 
-    suite = unittest.makeSuite(Test_Data_Manager,'test')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_file_boundary_stsI_beyond_model_time')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_file_boundary_stsIV_sinewave_ordering')
@@ -10917 +10930 @@
     #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sts_individual_sources')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sts_ordering_different_sources')
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_read_mux_platform_problem')     
+    suite = unittest.makeSuite(Test_Data_Manager,'test_read_mux_platform_problem2')     
 
     

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -338 +338 @@
     int *fros_per_source=NULL;     
     int *lros_per_source=NULL;         
-    
+
+    
+    printf("Getting into the c code\n");    
     _read_mux2_headers(numSrc, 
                        muxFileNameArray, 
@@ -705 +707 @@
     // not recording but at least one other gauge is. 
     // Pad the non-recording gauge array with zeros.
+    printf("Data put into the cdata array from C code\n");
     for (i = 0; i < number_of_selected_stations; i++)
     {
@@ -732 +735 @@
         for (j = 0; j < POFFSET; j++)
         {
+          printf("cdata[%d][%d] = %f\n", i, nt+j, cdata[i][nt + j]);
             *(double*)(pydata->data + i*pydata->strides[0] 
                                 + (num_ts + j)*pydata->strides[1]) =