Changeset 3741

Timestamp:

Oct 11, 2006, 11:57:10 AM (18 years ago)

Author:

duncan

Message:

fix bugs

Location:

anuga_core/source/anuga

Files:

• pmesh/test_mesh_interface.py (modified) (1 diff)
• shallow_water/data_manager.py (modified) (1 diff)
• shallow_water/test_data_manager.py (modified) (5 diffs)

anuga_core/source/anuga/pmesh/test_mesh_interface.py

@@ -6 +6 @@
 from anuga.pmesh.mesh import importMeshFromFile
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
-from anuga.pmesh.mesh_interface import _create_mesh_from_regions
+
+# This not work on DSG's desktop
+#from anuga.pmesh.mesh_interface import _create_mesh_from_regions
+#But this does.  maybe due to me using python 2.3?
+from mesh_interface import _create_mesh_from_regions
 from load_mesh.loadASCII import *
 from anuga.utilities.polygon import is_inside_polygon

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4232 +4232 @@
     msg = "Bad data in the mux file."
     if points_num < 0:
+        f.close()
         raise ANUGAError, msg
     if time_step_count < 0:
+        f.close()
         raise ANUGAError, msg
     if time_step < 0:
+        f.close()
         raise ANUGAError, msg
     

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -11 +11 @@
 from struct import pack
 
-from anuga.shallow_water.data_manager import *
 from anuga.shallow_water import *
+from data_manager import *
 from anuga.config import epsilon
+from anuga.utilities.anuga_exceptions import ANUGAError
+from anuga.utilities.numerical_tools import ensure_numeric
 
 # This is needed to run the tests of local functions
@@ -5006 +5008 @@
                 quantities_init[1].append(n ) # UA
                 quantities_init[2].append(e) # VA
-        #print "lonlatdeps",lonlatdeps 
-        base_name = str(id(self))
+        #print "lonlatdeps",lonlatdeps
+        _,base_name = tempfile.mkstemp("")
         files = []        
         for i,q in enumerate(quantities): 
@@ -5046 +5048 @@
         time_step_count = 45
         time_step = -7
-        base_name = str(id(self))
+        _,base_name = tempfile.mkstemp("")
         files = []
         quantities = ['HA','UA','VA']
@@ -5071 +5073 @@
             raise msg
         sww_file = base_name + '.sww'
-        
         self.delete_mux(files)
         
@@ -5193 +5194 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_minimum_storable_height')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sww_test_fail')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sww')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
     runner = unittest.TextTestRunner()