Changeset 6702

Timestamp:

Apr 2, 2009, 4:04:16 PM (15 years ago)

Author:

rwilson

Message:

Further numpy back merges from main trunk.

Files:

• anuga_validation/okushiri_2005/test_caching_of_set_quantity.py (modified) (2 diffs)
• branches/numpy/anuga/utilities/log.py (modified) (5 diffs)
• branches/numpy/anuga/utilities/log_test.py (modified) (1 diff)

anuga_validation/okushiri_2005/test_caching_of_set_quantity.py

@@ -7 +7 @@
 This script depends on  Benchmark_2.msh and Benchmark_2_Bathymetry.pts
 """
+# FIXME(Ole): This needs to become a unit test - in automated validation tests under Okushiri.
 
-# FIXME(Ole): This script is obsolete and has been moved into the 
-# automatic validation unit test suite.
+# FIXME(Ole): This won't work until ticket:314 has been fixed.
 
 # Module imports
@@ -38 +38 @@
           'alpha': alpha,
           'verbose': internal_verbose,
+          'acceptable_overshoot': 1.01, # This is the default value in _fit_to_mesh - actually, not implemented. Remove!
           'mesh_origin': None,
           'data_origin': None,

branches/numpy/anuga/utilities/log.py

@@ -19 +19 @@
 to configure the logging.
 Note that this module uses features of the logging package that were introduced
-in python2.5.  If running on earlier versions, these features are disables:
-    . Module name + line number
+in python2.5.  If running on earlier versions, these features are disabled:
+    . Calling module name + line number
 '''
 
@@ -84 +84 @@
     if not _setup:
         # sanity check the logging levels, require console >= file
-        if console_logging_level < log_logging_level:
+        if log_logging_level > console_logging_level:
             log_logging_level = console_logging_level
 
@@ -122 +122 @@
     for (fpath, lnum, mname, _) in frames:
         fname = os.path.basename(mname).rsplit('.', 1)[0]
+        print 'fname=%s, mname=%s' % (fname, mname)
         if mname != __name__:
             break
@@ -164 +165 @@
     log(logging.CRITICAL, msg)
 
-def resource_usage(level=logging.CRITICAL):
-    '''Log resource usage at given log level.'''
+##
+# @brief Log memory usage at time of call.
+# @param level Override the default INFO logging level.
+# @note From http://code.activestate.com/recipes/286222/.
+def resource_usage(level=logging.INFO):
+    '''Log memory usage at given log level.'''
 
     if sys.platform != 'win32':
@@ -213 +218 @@
     else:
         pass
+
+if __name__ == "__main__":
+    debug('DEBUG message')
+    info('INFO message')
+    warning('WARNING message')

branches/numpy/anuga/utilities/log_test.py

@@ -27 +27 @@
 
     def tearDown(self):
-        if os.path.exists(LOGFILE_NAME):
-            os.remove(LOGFILE_NAME)
-        if os.path.exists(STDOUT_LOG_NAME):
-            os.remove(STDOUT_LOG_NAME)
+        pass
+#        if os.path.exists(LOGFILE_NAME):
+#            os.remove(LOGFILE_NAME)
+#        if os.path.exists(STDOUT_LOG_NAME):
+#            os.remove(STDOUT_LOG_NAME)
 
     ##