Changeset 5963

Timestamp:

Nov 17, 2008, 1:47:15 PM (16 years ago)

Author:

ole

Message:

Work on platform bug

Location:

anuga_core/source/anuga/shallow_water

Files:

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

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -6079 +6079 @@
             file = base_name + mux_names[i]
             
-            #print "base_name file", file 
+            #print 'base_name file', file 
             f = open(file, 'wb')
             files.append(file)
@@ -6564 +6564 @@
 
         for i, q in enumerate(quantities):
+            #print
+            #print i, q
+            
             q_time = zeros((time_step_count, points_num), Float)
             quantities_init[i] = ensure_numeric(quantities_init[i])
@@ -6617 +6620 @@
                 for point_i in range(points_num):
                     if time+1>=first_tstep[point_i] and time+1<=last_tstep[point_i]:
-                        assert abs(q_time[time, point_i]-unpack('f',f.read(4))[0])<epsilon
+                        x = unpack('f',f.read(4))[0]
+                        #print time, x, q_time[time, point_i]
+                        assert abs(q_time[time, point_i]-x)<epsilon
 
             f.close()
@@ -11043 +11048 @@
 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')
@@ -11052 +11057 @@
 
     # FIXME (Ole): This is the test that fails under Windows
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_read_mux_platform_problem2')
+    suite = unittest.makeSuite(Test_Data_Manager,'test_read_mux_platform_problem2')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_file_boundary_stsIV')
 

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -436 +436 @@
         // 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]);        
-        //}
+        // that fails on Windows but works OK on Linux. JJ's test on 17th November shows
+        // that as far as Python is concerned this file should be OK on both platforms.
         
+        // These printouts are enough to show the problem when compared on the two platforms 
+        printf("\nRead %d elements, ", (int) numData);
+        printf("muxdata[%d]=%f\n", 39, muxData[39]);            
+        
+        /*
+        In Windows we get
+        Read 85 elements, muxdata[39]=0.999574
+        Read 85 elements, muxdata[39]=-0.087599
+        Read 85 elements, muxdata[39]=-0.087599
+        
+        I Linux we get (the correct)
+        */
         
         // loop over stations present in the permutation array