Changeset 6711 for anuga_core/source/anuga/shallow_water/test_data_manager.py

Timestamp:

Apr 3, 2009, 12:11:24 PM (16 years ago)

Author:

ole

Message:

Reverted (manually) changeset:6215 and thus reinstated storage of the _range information. It turned out the MIRONE relies on this. Apologies to all.

File:

• anuga_core/source/anuga/shallow_water/test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -251 +251 @@
 
         # Get the variables
-        #range = fid.variables['stage_range'][:]
+        range = fid.variables['stage_range'][:]
         #print range
-        #assert num.allclose(range,[-0.93519, 0.15]) or\
-        #       num.allclose(range,[-0.9352743, 0.15]) or\
-        #       num.allclose(range,[-0.93522203, 0.15000001]) # Old slope limiters
-        
-        #range = fid.variables['xmomentum_range'][:]
+        assert num.allclose(range,[-0.93519, 0.15]) or\
+               num.allclose(range,[-0.9352743, 0.15]) or\
+               num.allclose(range,[-0.93522203, 0.15000001]) # Old slope limiters
+        
+        range = fid.variables['xmomentum_range'][:]
         ##print range
-        #assert num.allclose(range,[0,0.4695096]) or \
-        #       num.allclose(range,[0,0.47790655]) or\
-        #       num.allclose(range,[0,0.46941957]) or\
-        #       num.allclose(range,[0,0.47769409])
-
-        
-        #range = fid.variables['ymomentum_range'][:]
+        assert num.allclose(range,[0,0.4695096]) or \
+               num.allclose(range,[0,0.47790655]) or\
+               num.allclose(range,[0,0.46941957]) or\
+               num.allclose(range,[0,0.47769409])
+
+        
+        range = fid.variables['ymomentum_range'][:]
         ##print range
-        #assert num.allclose(range,[0,0.02174380]) or\
-        #       num.allclose(range,[0,0.02174439]) or\
-        #       num.allclose(range,[0,0.02283983]) or\
-        #       num.allclose(range,[0,0.0217342]) or\
-        #       num.allclose(range,[0,0.0227564]) # Old slope limiters 
+        assert num.allclose(range,[0,0.02174380]) or\
+               num.allclose(range,[0,0.02174439]) or\
+               num.allclose(range,[0,0.02283983]) or\
+               num.allclose(range,[0,0.0217342]) or\
+               num.allclose(range,[0,0.0227564]) # Old slope limiters 
         
         fid.close()