Changeset 7317 for anuga_core/source/anuga/utilities

Timestamp:

Jul 22, 2009, 9:22:11 AM (16 years ago)

Author:

rwilson

Message:

Replaced 'print' statements with log.critical() calls.

Location:

anuga_core/source/anuga/utilities

Files:

• numerical_tools.py (modified) (2 diffs)
• polygon.py (modified) (5 diffs)
• quad.py (modified) (6 diffs)
• system_tools.py (modified) (2 diffs)

anuga_core/source/anuga/utilities/numerical_tools.py

@@ -7 +7 @@
 from warnings import warn
 
+import anuga.utilities.log as log
 import numpy as num
 
@@ -41 +42 @@
             raise ValueError, errmsg
         else:
-            print 'NOTE: changing argument to acos from %.18f to 1.0' %x
+            log.critical('NOTE: changing argument to acos from %.18f to 1.0' %x)
             x = 1.0
 

anuga_core/source/anuga/utilities/polygon.py

@@ -9 +9 @@
 from anuga.geospatial_data.geospatial_data import ensure_absolute, Geospatial_data
 from anuga.config import netcdf_float
+import anuga.utilities.log as log
 
 
@@ -642 +643 @@
 
     if verbose:
-        print 'Found %d points (out of %d) inside polygon' % (count, M)
+        log.critical('Found %d points (out of %d) inside polygon' % (count, M))
 
     return indices, count
@@ -929 +930 @@
                    'within its regions in [%.2f, %.2f], y in [%.2f, %.2f]'
                    % (min(x), max(x), min(y), max(y)))
-            print msg
+            log.critical(msg)
 
         return z
@@ -1121 +1122 @@
     # TO DO check if any of the regions fall inside one another
 
-    print '----------------------------------------------------------------------------'
-    print 'Polygon   Max triangle area (m^2)   Total area (km^2)   Estimated #triangles'
-    print '----------------------------------------------------------------------------'    
+    log.critical('-' * 80)
+    log.critical('Polygon   Max triangle area (m^2)   Total area (km^2) '
+                 'Estimated #triangles')
+    log.critical('-' * 80)
         
     no_triangles = 0.0
@@ -1134 +1136 @@
         area -= this_area
 
-        print 'Interior ',
-        print ('%.0f' % resolution).ljust(25),
-        print ('%.2f' % (this_area/1000000)).ljust(19),
-        print '%d' % (this_triangles)
+        log.critical('Interior %s%s%d'
+                     % (('%.0f' % resolution).ljust(25),
+                        ('%.2f' % (this_area/1000000)).ljust(19), 
+                        this_triangles))
+        #print 'Interior ',
+        #print ('%.0f' % resolution).ljust(25),
+        #print ('%.2f' % (this_area/1000000)).ljust(19),
+        #print '%d' % (this_triangles)
 
     bound_triangles = area/remainder_res
     no_triangles += bound_triangles
 
-    print 'Bounding ',
-    print ('%.0f' % remainder_res).ljust(25),
-    print ('%.2f' % (area/1000000)).ljust(19),
-    print '%d' % (bound_triangles)
+    log.critical('Bounding %s%s%d'
+                 % (('%.0f' % remainder_res).ljust(25),
+                    ('%.2f' % (area/1000000)).ljust(19),
+                    bound_triangles))
+    #print 'Bounding ',
+    #print ('%.0f' % remainder_res).ljust(25),
+    #print ('%.2f' % (area/1000000)).ljust(19),
+    #print '%d' % (bound_triangles)
 
     total_number_of_triangles = no_triangles/0.7
 
-    print 'Estimated total number of triangles: %d' %total_number_of_triangles
-    print 'Note: This is generally about 20% less than the final amount'
+    log.critical('Estimated total number of triangles: %d'
+                 % total_number_of_triangles)
+    log.critical('Note: This is generally about 20%% '
+                 'less than the final amount')
 
     return int(total_number_of_triangles)

anuga_core/source/anuga/utilities/quad.py

@@ -6 +6 @@
 from treenode import TreeNode
 import string, types, sys
+import anuga.utilities.log as log
 
 
@@ -124 +125 @@
             three_cells = self.branch.pop()
             for cell in three_cells:
-                #print "cell ", cell.show() 
                 points += cell.retrieve(get_vertices=get_vertices)
         return points, self.branch
@@ -223 +223 @@
             triangles = {}
             verts = self.retrieve_vertices()
-            # print "verts", verts
             for vert in verts:
                 triangle_list = self.mesh.get_triangles_and_vertices_per_node(vert)
                 for k, _ in triangle_list:
                     if not triangles.has_key(k):
-                        # print 'k',k
                         tri = self.mesh.get_vertex_coordinates(k,
                                                                absolute=True)
@@ -372 +370 @@
         """
         if depth == 0:
-            print 
-        print "%s%s" % ('  '*depth, self.name),
-        if self.children:
-            print
+            log.critical() 
+        log.critical("%s%s" % ('  '*depth, self.name))
+        if self.children:
+            log.critical()
             for child in self.children:
                 child.show(depth+1)
         else:
-            print '(xmin=%.2f, xmax=%.2f, ymin=%.2f, ymax=%.2f): [%d]'\
-                  %(self.western, self.eastern,
-                    self.southern, self.northern,
-                    self.count()) 
+            log.critical('(xmin=%.2f, xmax=%.2f, ymin=%.2f, ymax=%.2f): [%d]'
+                         % (self.western, self.eastern, self.southern,
+                            self.northern, self.count()))
 
 
@@ -390 +387 @@
         """
         if depth == 0:
-            print 
-        print "%s%s:" % ('  '*depth, self.name),
+            log.critical() 
+        log.critical("%s%s:" % ('  '*depth, self.name))
         if self.children:
             print
@@ -397 +394 @@
                 child.show_all(depth+1)
         else:
-            print '%s' %self.retrieve()
+            log.critical('%s' % self.retrieve())
 
 

anuga_core/source/anuga/utilities/system_tools.py

@@ -15 +15 @@
 except ImportError:
     import md5 as hashlib
+
+import anuga.utilities.log as log
 
 
@@ -238 +240 @@
 
         if verbose is True:
-            print 'Version info stored to %s' %filename
+            log.critical('Version info stored to %s' % filename)