Changeset 4425 for anuga_core/source/anuga/caching

Timestamp:

May 3, 2007, 6:23:44 PM (18 years ago)

Author:

ole

Message:

Added points datafile as a caching dependency.
Also implemented that caching now throws an error if dependency file has been removed after caching has taken place.

File:

• anuga_core/source/anuga/caching/caching.py (modified) (5 diffs)

anuga_core/source/anuga/caching/caching.py

@@ -282 +282 @@
   # Force singletons into a tuple.
   #
+
   if dependencies and type(dependencies) != types.TupleType \
                   and type(dependencies) != types.ListType:
@@ -817 +818 @@
   (argsfile,compressed1) = myopen(CD+FN+'_'+file_types[1],"rb",compression)
   (admfile,compressed2) =  myopen(CD+FN+'_'+file_types[2],"rb",compression)
+
+  if verbose is True and deps is not None:
+    print 'Caching: Dependencies are', deps.keys()
 
   if not (argsfile and datafile and admfile) or \
@@ -1504 +1508 @@
   import types
 
+  #print 'Caching DEBUG: Dependencies are', dependencies
   d = {}
   if dependencies:
@@ -1512 +1517 @@
     for FN in dependencies:
       expanded_FN = glob.glob(FN)
-      
+
+      if expanded_FN == []:
+        errmsg = 'ERROR (caching.py): Dependency '+FN+' does not exist.'
+        raise Exception, errmsg      
+
       expanded_dependencies += expanded_FN
 
@@ -1519 +1528 @@
       if not type(FN) == types.StringType:
         errmsg = 'ERROR (caching.py): Dependency must be a string.\n'
-        errmsg += '                    Dependency given: %s' %FN
+        errmsg += '                   Dependency given: %s' %FN
         raise Exception, errmsg      
       if not os.access(FN,os.F_OK):