Changeset 4195

Timestamp:

Jan 29, 2007, 5:50:24 PM (18 years ago)

Author:

nick

Message:

small change to screen catcher and add prints to split method in geospatial_data.py

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/util.py (modified) (2 diffs)
• geospatial_data/geospatial_data.py (modified) (4 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -9 +9 @@
 import os
 
-from os import remove, mkdir, access, F_OK, sep
+from os import remove, mkdir, access, F_OK, W_OK, sep
 from os.path import exists, basename
 from warnings import warn
@@ -508 +508 @@
 
     dir_name = dir_name
-    if access(dir_name,F_OK) == 0:
+    if access(dir_name,W_OK) == 0:
         print 'Make directory %s' %dir_name
         mkdir (dir_name,0777)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -624 +624 @@
     
     
-    def split(self, factor=0.5):
+    def split(self, factor=0.5, verbose=False):
         """Returns two geospatial_data object, first is size of the 'factor'
         smaller the original and the second is the remainer. The two new 
@@ -649 +649 @@
         
         #find unique random numbers
+        if verbose: print "make unique random number list and get indices"
         while i < new_size:
             random_num = randint(0,self_size-1)
@@ -656 +657 @@
 
         #Make list of opposite to random_list
+        if verbose: print "make list of opposite to random list"
         for i in range(0,self_size,1):
             remainder_list.append(i)
@@ -663 +665 @@
         random_list.sort()
         random_list.reverse()
+        if verbose: print "get indices of oppisite to random list"
         for i in random_list:
             remainder_list.pop(i)
             
         #get new samples
+        if verbose: print "get values of indices for random list"
         G1 = self.get_sample(random_list)
+        if verbose: print "get values of indices for opposite of random list"
         G2 = self.get_sample(remainder_list)