Changeset 4220

Timestamp:

Feb 6, 2007, 1:38:16 PM (17 years ago)

Author:

ole

Message:

Re-established caching of set_values_from_file until further notice.

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -738 +738 @@
         triangles = self.domain.triangles      #FIXME
 
-        vertex_attributes = fit_to_mesh(coordinates, triangles,filename,
-                                        alpha=alpha,
-                                        attribute_name=attribute_name,
-                                        use_cache=use_cache,
-                                        verbose=verbose)
-                                #, max_read_lines=max_read_lines)
+
+        # Use caching at this level until loading has been fixed.
+        if use_cache is True:
+            from anuga.caching import cache 
+            vertex_attributes = cache(fit_to_mesh,
+                                      (coordinates, triangles, filename),
+                                      {'alpha': alpha,
+                                       'attribute_name': attribute_name,
+                                       'use_cache': False,
+                                       'verbose': verbose},
+                                      verbose=verbose)
+        else:
+            vertex_attributes = fit_to_mesh(coordinates, triangles,filename,
+                                            alpha=alpha,
+                                            attribute_name=attribute_name,
+                                            use_cache=use_cache,
+                                            verbose=verbose)
+            
+                                
         #Call underlying method using array values
         self.set_values_from_array(vertex_attributes,