Changeset 6237

Timestamp:

Jan 29, 2009, 3:00:47 AM (16 years ago)

Author:

ole

Message:

Comments regarding ticket:314 and cleanup

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py (modified) (1 diff)
• anuga_core/source/anuga/fit_interpolate/fit.py (modified) (1 diff)
• anuga_validation/okushiri_2005/test_caching_of_set_quantity.py (modified) (7 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -876 +876 @@
         # FIXME(Ole): I noticed a couple of examplse where this caused
         # a crash in fittng, so disabled it until I can investigate further
-        # Sorry. 23 Jan 2009
+        # Sorry. 23 Jan 2009. Logged as ticket:314
         if False:
             # Use mesh as defined by domain

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -299 +299 @@
                         AtA[j,k] += sigmas[j]*sigmas[k]
             else:
+                # FIXME(Ole): This is the message referred to in ticket:314
                 msg = 'Could not find triangle for point %s. ' % str(x) 
                 msg += 'Mesh boundary is %s' % str(self.mesh_boundary_polygon)

anuga_validation/okushiri_2005/test_caching_of_set_quantity.py

@@ -1 @@
-"""Validation of the AnuGA implementation of the shallow water wave equation.
+"""This script tests that caching works for set_quantity using point data from a file.
+First cache is cleared, then set_quantity is run twice checking that
+fitting is evaluated only first time and that the result from cache on the
+second round is correct.
 
-This script sets up Okushiri Island benchmark as published at the
+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.
 
-THE THIRD INTERNATIONAL WORKSHOP ON LONG-WAVE RUNUP MODELS
-June 17-18 2004
-Wrigley Marine Science Center
-Catalina Island, California
-http://www.cee.cornell.edu/longwave/
-
-
-The validation data was downloaded and made available in this directory
-for convenience but the original data is available at
-http://www.cee.cornell.edu/longwave/index.cfm?page=benchmark&problem=2
-where a detailed description of the problem is also available.
-
-
-Run create_okushiri.py to process the boundary condition and build a the
-mesh before running this script.
-
-
-"""
-# NOTE: Cache should be cleared before running this script
-
+# FIXME(Ole): This won't work until ticket:314 has been fixed.
 
 # Module imports
@@ -30 +16 @@
 import project
 import Numeric as num
+import time
 
-internal_verbose = False # Verbose used in set_quantity and passed into fit_to_mesh
+internal_verbose = True # Verbose used in set_quantity and passed into fit_to_mesh
 
 filename=project.bathymetry_filename
@@ -50 +37 @@
           'alpha': alpha,
           'verbose': internal_verbose,
-          'acceptable_overshoot': 1.01, # This is the default value in _fit_to_mesh
+          'acceptable_overshoot': 1.01, # This is the default value in _fit_to_mesh - actually, not implemented. Remove!
           'mesh_origin': None,
           'data_origin': None,
@@ -80 +67 @@
 #-------------------------
 #print 'Set elevation and cache'
+t0 = time.time()
 domain.set_quantity('elevation',
                     filename=filename,
@@ -85 +73 @@
                     verbose=internal_verbose,
                     use_cache=True)
+compute_time = time.time()-t0
                     
 ref = domain.get_quantity('elevation').get_values()                    
@@ -100 +89 @@
 
 # Now check this using the high level call
-#print 'Try to read in via cache'
+
+print 'Try to read in via cache'
+t0 = time.time()
 domain.set_quantity('elevation',
                     filename=filename,
@@ -106 +97 @@
                     verbose=internal_verbose,
                     use_cache=True)
+cache_time = time.time()-t0                    
                     
 res = domain.get_quantity('elevation').get_values()                                        
 assert num.allclose(res, ref)
+
+print 'cache_time', cache_time
+print 'compute_time', compute_time
+assert cache_time < compute_time/10