Changeset 3983

Timestamp:

Nov 14, 2006, 2:20:29 PM (18 years ago)

Author:

duncan

Message:

new function. Create a directory structure. Handy for writing data to.

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• test_util.py (modified) (2 diffs)
• util.py (modified) (3 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py

@@ -5 +5 @@
 from Numeric import zeros, array, allclose, Float
 from math import sqrt, pi
-import tempfile
+import tempfile, os
+from os import access, F_OK,sep, removedirs
 
 from anuga.abstract_2d_finite_volumes.util import *
@@ -1154 +1155 @@
         assert info.startswith('Revision')
                           
-                          
+        
+    def test_add_directories(self):
+        
+        import tempfile
+        root_dir = tempfile.mkdtemp('_test_util', 'test_util_')
+        directories = ['ja','ne','ke']
+        kens_dir = add_directories(root_dir, directories)
+        assert kens_dir == root_dir + sep + 'ja' + sep + 'ne' + \
+               sep + 'ke'
+        assert access(root_dir,F_OK)
+
+        #clean up!
+        os.rmdir(kens_dir)
+        os.rmdir(root_dir + sep + 'ja' + sep + 'ne')
+        os.rmdir(root_dir + sep + 'ja')
+        os.rmdir(root_dir)
 
 #-------------------------------------------------------------
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_Util,'test')
-    #suite = unittest.makeSuite(Test_Util,'test_get_version_info')
+    #suite = unittest.makeSuite(Test_Util,'test_add_directories')
     runner = unittest.TextTestRunner()
     runner.run(suite)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -9 +9 @@
 
 from os import remove, mkdir, access, F_OK, sep
-from os.path import exists
+from os.path import exists, basename
 from warnings import warn
 from shutil import copy
@@ -1195 +1195 @@
     return texfile2, elev_output
 
-from os.path import basename
-
+# FIXME (DSG): Add unit test, make general, not just 2 files,
+# but any number of files.
 def copy_code_files(dir_name, filename1, filename2):
     """Copies "filename1" and "filename2" to "dir_name". Very useful for 
@@ -1209 +1209 @@
     print 'Files %s and %s copied' %(filename1, filename2)
 
-
-
-
-
+def add_directories(root_directory, directories):
+    """
+    Add the first directory in directories to root_directory.  Then add the second
+    direcotory to the first directory and so on.
+
+    Return the path of the final directory.
+
+    This is handy for specifying and creating a directory where data will go.
+    """
+    dir = root_directory
+    for new_dir in directories:
+        dir = dir + sep + new_dir
+        if not access(dir,F_OK):
+            mkdir (dir)
+    return dir
+
+
+