Changeset 4131

Timestamp:

Jan 5, 2007, 2:30:04 PM (18 years ago)

Author:

nick

Message:

add "number_mesh_triangles" to polygon, given interior regions and bounding poly returns approx number of triangles in mesh

also
editted screen_catcher in util.py

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/util.py (modified) (2 diffs)
• utilities/polygon.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -502 +502 @@
 ##################### end of obsolete stuff ? ############
 
-def start_screen_catcher(dirname, myid=0, numprocs=1):
+def start_screen_catcher(dir_name, myid=0, numprocs=1):
     """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)
-
+    dir_name = dir_name
+    if access(dir_name,F_OK) == 0:
+        print 'Make directory %s' %dir_name
+        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)
+    
     #used to catch screen output to file
     sys.stdout = Screen_Catcher(screen_output_name)
@@ -522 +525 @@
     def __init__(self, filename):
         self.filename = filename
+ 
         if exists(self.filename)is True:
             remove(self.filename)

anuga_core/source/anuga/utilities/polygon.py

@@ -737 +737 @@
     FIXME: Add tests for this function
     """
-    import polygon_area
+    from anuga.utilities.polygon import polygon_area
     
     # TO DO check if any of the regions fall inside one another
     no_triangles = 0.0
     area = polygon_area(bounding_poly)
+#    print 'area of bounding_poly with res ',remainder_res,' is ', area/1000000.
     for i,j in interior_regions:
         this_area = polygon_area(i)
-        no_triangles += this_area/j
+        this_triangles = this_area/j
+        no_triangles += this_triangles
         area -= this_area
         #convert to square Kms
-        print 'area of ',j, this_area/1000000., area/1000000.
-    no_triangles += area/remainder_res
+        print 'area of',j, 'trigs', this_triangles, 'this area', this_area/1000000.
+    bound_triangles = area/remainder_res
+    no_triangles += bound_triangles
+    print 'area of',remainder_res,'bound triangles:', bound_triangles, 'bound area:', area/1000000.
     return int(no_triangles/0.7)
-