Changeset 5104

Timestamp:

Mar 4, 2008, 10:09:41 AM (16 years ago)

Author:

duncan

Message:

IP licence work

Files:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (1 diff)
• anuga_validation/automated_validation_tests/UQ_runup_2006/RE sensitivity results SECUNCLASSIFIED.htm (deleted)
• anuga_validation/automated_validation_tests/urs_mux_files_validation/o_test_velocity-e-mux.mux (moved) (moved from anuga_validation/automated_validation_tests/urs_mux_files_validation/o_test_velocity-e-mux)
• anuga_validation/automated_validation_tests/urs_mux_files_validation/o_test_velocity-n-mux.mux (moved) (moved from anuga_validation/automated_validation_tests/urs_mux_files_validation/o_test_velocity-n-mux)
• anuga_validation/automated_validation_tests/urs_mux_files_validation/o_test_waveheight-z-mux.mux (moved) (moved from anuga_validation/automated_validation_tests/urs_mux_files_validation/o_test_waveheight-z-mux)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4168 +4168 @@
     quantities = ['HA','UA','VA']
 
-    for file_name in files_in:
-        if os.access(file_name, os.F_OK) == 0 :
-            msg = 'File %s does not exist or is not accessible' %file_name
-            raise IOError, msg
-        
+    #if os.access(files_in[0]+'.mux', os.F_OK) == 0 :
+    print "dfdfds"
+    for i, file_name in enumerate(files_in):
+        if os.access(file_name, os.F_OK) == 0:
+            if os.access(file_name+'.mux', os.F_OK) == 0 :
+                msg = 'File %s does not exist or is not accessible' %file_name
+                raise IOError, msg
+            else:
+               files_in[i] += '.mux'
+               print "file_name", file_name
+    print "files_in",   files_in
     hashed_elevation = None
     for file_in, file_out, quantity in map(None, files_in,