Changeset 4270

Timestamp:

Feb 19, 2007, 2:25:18 PM (18 years ago)

Author:

nick

Message:

small change to screen_catcher and added cases for true and false to caching

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/util.py (modified) (3 diffs)
• caching/caching.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -502 +502 @@
 ##################### end of obsolete stuff ? ############
 
-def start_screen_catcher(dir_name, myid=0, numprocs=1):
+def start_screen_catcher(dir_name, myid=0, numprocs=1, print_to_screen=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.
@@ -509 +510 @@
     dir_name = dir_name
     if access(dir_name,W_OK) == 0:
-        print 'Make directory %s' %dir_name
+        if verbose: print 'Make directory %s' %dir_name
+        if verbose: print "myid", myid
         mkdir (dir_name,0777)
     screen_output_name = dir_name + "screen_output_%d_%d.txt" %(myid,numprocs)
     screen_error_name = dir_name + "screen_error_%d_%d.txt" %(myid,numprocs)
-    
+    print screen_output_name
     #used to catch screen output to file
     sys.stdout = Screen_Catcher(screen_output_name)
@@ -533 +535 @@
         fid = open(self.filename, 'a')
         fid.write(stuff)
+#        if print_to_screen: print stuff
 
 def get_revision_number():

anuga_core/source/anuga/caching/caching.py

@@ -1323 +1323 @@
   import types
 
-  # On some architectures None gets different hash values
+  # On some architectures None, False and True gets different hash values
   if T is None:
+    return(-1)
+  if T is False:
+    return(0)
+  if T is True:
     return(1)