Changeset 5791

Timestamp:

Sep 26, 2008, 11:26:53 AM (15 years ago)

Author:

ole

Message:

Bypassed caching in interpolate for windows due to filename problem.
Tests worked on Linux but not on Windoze.
This only affects a small optimisation when running on Windows

Location:

anuga_core/source/anuga

Files:

• caching/caching.py (modified) (2 diffs)
• fit_interpolate/interpolate.py (modified) (1 diff)

anuga_core/source/anuga/caching/caching.py

@@ -1029 +1029 @@
 # -----------------------------------------------------------------------------
 
-def save_args_to_cache(CD,FN,args,kwargs,compression):
+def save_args_to_cache(CD, FN, args, kwargs, compression):
   """Save arguments to cache
 
@@ -1040 +1040 @@
   (argsfile, compressed) = myopen(CD+FN+'_'+file_types[1], 'wb', compression)
 
-  if not argsfile:
-    if verbose:
-      print 'ERROR (caching): Could not open %s' %argsfile.name
-    raise IOError
+  if argsfile is None:
+    msg = 'ERROR (caching): Could not open argsfile for writing: %s' %FN
+    raise IOError, msg
 
   mysave((args,kwargs),argsfile,compression)  # Save args and kwargs to cache

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -376 +376 @@
         point_coordinates = ensure_numeric(point_coordinates, Float)
         f = ensure_numeric(f, Float)        
-            
-        if use_cache is True:
+
+        import sys
+        if use_cache is True and sys.platform != 'win32':
+            # FIXME (Ole): (Why doesn't this work on windoze?)
+            
             X = cache(self._build_interpolation_matrix_A,
-                      (point_coordinates),
-                      {'verbose': verbose},                        
+                      args=(point_coordinates,),
+                      kwargs={'verbose': verbose},                        
                       verbose=verbose)        
         else: