Changeset 5937

Timestamp:

Nov 11, 2008, 2:41:49 PM (16 years ago)

Author:

ole

Message:

Removed print statements and added comments in regard to the debugging of mux_reader causing unit test to fail under windows

Location:

anuga_core/source/anuga/shallow_water

Files:

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

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -6489 +6489 @@
 
         #print 'Second station to be written to MUX'
-        #print 'ha', ha1[2,:]
-        #print 'ua', ua1[2,:]
-        #print 'va', va1[2,:]
+        #print 'ha', ha1[0,:]
+        #print 'ua', ua1[0,:]
+        #print 'va', va1[0,:]
         
         # Write second mux file to be combined by urs2sts                                             
@@ -6502 +6502 @@
                                                va=va1)
 
+
+
+
+        # Read mux file back and verify it's correcness
+
+        ####################################################
+        # FIXME (Ole): This is where the test should
+        # verify that the MUX files are correct.
+        ####################################################
+
+        #print filesII
+        #print 'MUX FILE'
+        #fid = open(filesII[2], 'rb')
+        #blop = fid.read()
+
+
+
+
+
+
+        
                                                
         # Create ordering file
@@ -6529 +6550 @@
             # Read stage, u, v enumerated as j
 
-            if j < 2:
-                continue
             
+            #print 'Reading', j, file
             data = read_mux2(1, [file], weights, file_params, permutation, verbose)
 
-            print
-            print 'Data received by Python'
-            print data
-            #print file_params
-            print
-
-            import sys; sys.exit()
+            #print 'Data received by Python'
+            #print data[1][8]
+
             
             number_of_selected_stations = data.shape[0]
@@ -6551 +6567 @@
             
             for i in range(number_of_selected_stations):
-                quantity[i][:]=data[i][:parameters_index]
         
                 #print i, parameters_index
@@ -6562 +6577 @@
                     # FIXME (Ole): This is where the output is wrong on Win32
                     
-                    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:
-                        pass
-                        # Skip assert for this combination for now as the second error is more obvious
-                    else:
-                        
-                        assert allclose(data[i][:parameters_index], va1[permutation[i], :])
+                    #print
+                    #print j, i
+                    #print 'Input'
+                    #print 'u', ua1[permutation[i], 8]                                        
+                    #print 'v', va1[permutation[i], 8]
+                
+                    #print 'Output'
+                    #print 'v ', data[i][:parameters_index][8]                    
+                
+                    assert allclose(data[i][:parameters_index], va1[permutation[i], :])
                     
         
@@ -10930 +10939 @@
     #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sts_individual_sources')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sts_ordering_different_sources')
+
+    # FIXME (Ole): This is the test that fails under Windows
     suite = unittest.makeSuite(Test_Data_Manager,'test_read_mux_platform_problem2')     
 

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -20 +20 @@
 #define POFFSET 5 //Number of site_params
 
-static int *fros=NULL; 
-static int *lros=NULL;
+static int *fros=NULL;  // First recorded output step 
+static int *lros=NULL;  // Last recorded output step 
 static struct tgsrwg* mytgs0=NULL;
 
@@ -99 +99 @@
                 /* gauge is recording at this time */
                 memcpy(data + it, muxData + offset, sizeof(float));
+                
+                //printf("%d: muxdata=%f\n", it, muxData[offset]);                      
+                //printf("data[%d]=%f, offset=%d\n", it, data[it], offset);         
                 offset++;
             }
@@ -340 +343 @@
 
     
-    printf("Getting into the c code\n");    
     _read_mux2_headers(numSrc, 
                        muxFileNameArray, 
@@ -428 +430 @@
                              total_number_of_stations);
                              
-        fread(muxData, numData*sizeof(float), 1, fp); 
+        fread(muxData, ((int) numData)*sizeof(float), 1, fp); 
         fclose(fp);
 
+        // FIXME (Ole): This is where Nariman and Ole traced the platform dependent 
+        // difference on 11 November 2008. We don't think the problem lies in the 
+        // C code. Maybe it is a problem with the MUX files written by the unit test
+        // that fails on Windows but works OK on Linux.
+         
+        //printf("\nRead %d elements, ", (int) numData);
+        //printf("muxdata[%d]=%f\n", 39, muxData[39]);          
+        //for(i = 0; i < (int) numData; i++)
+        //{     
+        //    printf("muxdata[%d]=%f\n", i, muxData[i]);        
+        //}
+        
+        
         // loop over stations present in the permutation array 
         //     use ista with mux data
@@ -462 +477 @@
                     sts_data[i][k] = NODATA;
                 }
+                //printf("%d: temp_sts_data[%d]=%f\n", i, k, temp_sts_data[k]);     
+            
             }
+            
             
             // Update metadata (e.g. start time and end time)
@@ -501 +519 @@
     }
 
+    //printf("sts_data[1,8]=%f\n", sts_data[1][8]);
+    
     free(muxData);
     free(temp_sts_data);
@@ -707 +727 @@
     // 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");
+    //printf("\nData put into the cdata array from C code\n");
     for (i = 0; i < number_of_selected_stations; i++)
     {
@@ -725 +745 @@
                 else
                 {
+                  //printf("cdata[%d][%d] = %f\n", i, it, cdata[i][it]);
+                
                     *(double*)(pydata->data + i*pydata->strides[0] 
                                     + time*pydata->strides[1]) = 
@@ -734 +756 @@
         // Pass back lat,lon,elevation
         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]) = 
-                    cdata[i][nt + j];
+        {
+          *(double*)(pydata->data + i*pydata->strides[0] 
+                     + (num_ts + j)*pydata->strides[1]) = 
+            cdata[i][nt + j];
         }
     }