Changeset 1743

Timestamp:

Aug 23, 2005, 3:03:08 PM (20 years ago)

Author:

ole

Message:

Work on new set_quantity and caching

Location:

inundation

Files:

• caching/__init__.py (modified) (1 diff)
• pyvolution/quantity.py (modified) (1 diff)
• pyvolution/util.py (modified) (1 diff)

inundation/caching/__init__.py

@@ -2 +2 @@
 """
 
-pass
+from caching import *
 
+

inundation/pyvolution/quantity.py

@@ -79 +79 @@
 
 
+
+
+    #New leaner interface to setting values
+    #def set_quantity(self,
+    #                 numeric = None,  #List, numeric array or constant
+    #                 function = None, #Callable object: f(x,y) where x any are arrays 
+    #                 points = None, values = None, alpha = None, #Input for least squares
+    #                 filename, attribute_name,                   #Input from file
+    #                 location 
+    
+
+
+    #Old interface to setting values
     def set_values(self, X,
                    location='vertices',

inundation/pyvolution/util.py

@@ -348 +348 @@
 
         # Get the variables
-        points = fid.variables['points']
+        points = fid.variables['points'][:]
         keys = fid.variables.keys()
         attributes = {}
         for key in keys:
             if key != 'points':
-                attributes[key] = fid.variables[key]
-        #Don't close - arrays are needed outside this function,
-        #alternatively take a copy here
+                attributes[key] = fid.variables[key][:]
+
+        fid.close()        
     else:
         #Read as ASCII file assuming that it is separated by whitespace