Changeset 5961

Timestamp:

Nov 17, 2008, 1:10:48 PM (16 years ago)

Author:

ole

Message:

Added single_precision option

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/domain.py (modified) (1 diff)
• config.py (modified) (1 diff)
• shallow_water/test_data_manager.py (modified) (7 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -909 +909 @@
 
         # Define a tolerance for extremum computations
-        epsilon = 1.0e-6 # Import 'single_precision' from config
+        from anuga.config import single_precision as epsilon
         
         if self.quantities_to_be_monitored is None:

anuga_core/source/anuga/config.py

@@ -9 +9 @@
 default_smoothing_parameter = 0.001 # Default alpha for penalised
                                     # least squares fitting
-
+                                    
+single_precision = 1.0e-6           # Smallest single precision number
 velocity_protection = 1.0e-6                                     
 

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -3026 +3026 @@
 
         from anuga.coordinate_transforms.redfearn import redfearn
-
         #fid = NetCDFFile('small_ha.nc')
         fid = NetCDFFile(self.test_MOST_file + '_ha.nc')
@@ -6422 +6421 @@
         
         
-    def Xtest_read_mux_platform_problem2(self):
+    def test_read_mux_platform_problem2(self):
         """test_read_mux_platform_problem2
         
@@ -6433 +6432 @@
         from Numeric import sin, cos
         from urs_ext import read_mux2 
+        
+        from anuga.config import single_precision as epsilon        
         
         verbose = False
@@ -6590 +6591 @@
                 assert abs(az-unpack('f',f.read(4))[0])<epsilon
                 assert abs(baz-unpack('f',f.read(4))[0])<epsilon
-                assert abs(time_step-unpack('f',f.read(4))[0])<epsilon#*1e5
+                
+                x = unpack('f', f.read(4))[0]
+                #print time_step
+                #print x
+                assert abs(time_step-x)<epsilon
                 assert abs(time_step_count-unpack('i',f.read(4))[0])<epsilon
                 for j in range(4): # identifier
@@ -6609 +6614 @@
             #for time in  range(time_step_count):
             for time in range(min_tstep-1,max_tstep):
-                assert abs(time*time_step-unpack('f',f.read(4))[0])<epsilon#*1.e5
+                assert abs(time*time_step-unpack('f',f.read(4))[0])<epsilon
                 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#*2.e5
+                        assert abs(q_time[time, point_i]-unpack('f',f.read(4))[0])<epsilon
 
             f.close()
@@ -11036 +11041 @@
 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')
@@ -11045 +11050 @@
 
     # 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')