Changeset 3931

Timestamp:

Nov 7, 2006, 2:47:20 PM (17 years ago)

Author:

nick

Message:

generic_boundary_conditions.py updated to allow caching and thinning of boundary sww file to reduce computation time
util.py now has start_screen_catcher and copy_code_files used for information management

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• generic_boundary_conditions.py (modified) (2 diffs)
• test_util.py (modified) (1 diff)
• util.py (modified) (3 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/generic_boundary_conditions.py

@@ -185 +185 @@
     # rather than File_boundary
 
-    def __init__(self, filename, domain, verbose = False):
+    def __init__(self, filename, domain, time_thinning=1, 
+                 use_cache=False, verbose=False):
         import time
         from Numeric import array, zeros, Float
@@ -240 +241 @@
         self.F = file_function(filename, domain,
                                interpolation_points=self.midpoint_coordinates,
-                               verbose=verbose)
+                           time_thinning=time_thinning,
+                           use_cache=use_cache, 
+                           verbose=verbose)
         self.domain = domain
 

anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py

@@ -1159 +1159 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_Util,'test')
-    #suite = unittest.makeSuite(Test_Util,'test_apply')
+    #suite = unittest.makeSuite(Test_Util,'test_get_version_info')
     runner = unittest.TextTestRunner()
     runner.run(suite)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -6 +6 @@
 
 import anuga.utilities.polygon
+import sys
+
+from os import remove, mkdir, access, F_OK, sep
+from os.path import exists
 from warnings import warn
+from shutil import copy
 
 from anuga.geospatial_data.geospatial_data import ensure_absolute
-
-
 
 def file_function(filename,
@@ -497 +500 @@
 
 ##################### end of obsolete stuff ? ############
-'''
-this simply catches the screen output and files it to a file
-'''
-from os import sep
-
-class Screen_Catcher:
-
+
+def start_screen_catcher(dirname, myid, numprocs):
+    """Used to store screen output and errors to file, if run on multiple 
+    processes eachprocessor will have its own output and error file.
+    """
+
+    dirname = dirname
+    screen_output_name = dirname + "screen_output_%d_%d.txt" %(myid,numprocs)
+    screen_error_name = dirname + "screen_error_%d_%d.txt" %(myid,numprocs)
+
+    #used to catch screen output to file
+    sys.stdout = screen_catcher(screen_output_name)
+    sys.stderr = screen_catcher(screen_error_name)
+
+class screen_catcher:
+    """this simply catches the screen output and stores it to file defined by
+    start_screen_catcher (above)
+    """
+    
     def __init__(self, filename):
-#        self.data = ''
         self.filename = filename
+        if exists(self.filename)is True:
+            remove(self.filename)
+            print'Old existing file "%s" has been deleted' %(self.filename)
 
     def write(self, stuff):
         fid = open(self.filename, 'a')
-#        fid = open(self.filename, 'w')
-#        self.data = self.data + stuff
         fid.write(stuff)
-        fid.close()
-        
+
 def get_version_info():
     """gets the version number of the SVN
@@ -1149 +1163 @@
     
     return texfile2, elev_output
+
+from os.path import basename
+
+def copy_code_files(dir_name, filename1, filename2):
+    """Copies "filename1" and "filename2" to "dir_name". Very useful for 
+    information management """
+
+    if access(dir_name,F_OK) == 0:
+        print 'Make directory %s' %dir_name
+        mkdir (dir_name,0777)
+    copy(filename1, dir_name + sep + basename(filename1))
+    copy(filename2, dir_name + sep + basename(filename2))
+#    copy (__file__, project.output_run_time_dir + basename(__file__))
+    print 'Files %s and %s copied' %(filename1, filename2)
+
+
+
+
+