Changeset 4850

Timestamp:

Nov 22, 2007, 3:04:05 PM (17 years ago)

Author:

nick

Message:

cleaned up "screen_catcher" and made "copy_code_files" more flexible

File:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (5 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -5256 +5256 @@
         
 def start_screen_catcher(dir_name, myid='', numprocs='', extra_info='',
-                         print_to_screen=False, verbose=False):
-    """
+                         verbose=False):
+    """ 
     Used to store screen output and errors to file, if run on multiple 
     processes eachprocessor will have its own output and error file.
@@ -5263 +5263 @@
     extra_info - is used as a string that can identify outputs with another 
     string eg. '_other'
+    
+    FIXME: Would be good if you could suppress all the screen output and 
+    only save it to file... however it seems a bit tricky as this caputure
+    techique response to sys.stdout and by this time it is already printed out.
+    
     """
     import sys
     dir_name = dir_name
     if access(dir_name,W_OK) == 0:
-        if verbose: print 'Make directory %s' %dir_name
-        if verbose: print "myid", myid
+        if verbose: print 'Making directory %s' %dir_name
+      #  if verbose: print "myid", myid
         mkdir (dir_name,0777)
     if myid <>'':
@@ -5282 +5287 @@
                                                               numprocs,
                                                               extra_info)
-    print screen_output_name
+    if verbose: print screen_output_name
     #used to catch screen output to file
     sys.stdout = Screen_Catcher(screen_output_name)
@@ -5302 +5307 @@
         fid = open(self.filename, 'a')
         fid.write(stuff)
-#        if print_to_screen: print stuff
-
-def copy_code_files(dir_name, filename1, filename2):
+
+def copy_code_files(dir_name, filename1, filename2=None):
     """Copies "filename1" and "filename2" to "dir_name". Very useful for 
     information management 
@@ -5314 +5318 @@
         mkdir (dir_name,0777)
     shutil.copy(filename1, dir_name + sep + basename(filename1))
-    shutil.copy(filename2, dir_name + sep + basename(filename2))
-#    copy (__file__, project.output_run_time_dir + basename(__file__))
-    print 'Files %s and %s copied' %(filename1, filename2)
+    if filename2!=None:
+        shutil.copy(filename2, dir_name + sep + basename(filename2))
+        print 'Files %s and %s copied' %(filename1, filename2)
+    else:
+        print 'File %s copied' %(filename1)
 
 def get_data_from_file(filename,separator_value = ','):