Changeset 3417

Timestamp:

Jul 25, 2006, 1:53:31 PM (19 years ago)

Author:

duncan

Message:

comments and debugging

Location:

inundation/fit_interpolate

Files:

• interpolate.py (modified) (2 diffs)
• test_interpolate.py (modified) (2 diffs)

inundation/fit_interpolate/interpolate.py

@@ -281 +281 @@
                         depth_file,
                         velocity_file,
-                                #quantities = ['depth', 'velocity'],
-                                verbose=True,
-                                 use_cache = True):
+                        #quantities = ['depth', 'velocity'],
+                        verbose=True,
+                        use_cache = True):
     """
     Interpolate the quantities at a given set of locations, given
@@ -291 +291 @@
     In the future let points be a csv or xya file.
     And the user choose the quantities.
+
+    This is currently quite specific.
+    If it need to be more general, chagne things.
     """
     quantities =  ['stage', 'elevation', 'xmomentum', 'ymomentum']

inundation/fit_interpolate/test_interpolate.py

@@ -1415 +1415 @@
         depth_answers_array = [[6.0, 1.5], [15., 10.5]] 
         velocity_answers_array = [[5./6.0, 5./1.5], [5./15., 5./10.5]]
-        depth_reader = csv.reader(file(depth_file))
+        depth_file_handle = file(depth_file)
+        depth_reader = csv.reader(depth_file_handle)
         depth_reader.next()
-        velocity_reader = csv.reader(file(velocity_file))
+        velocity_file_handle = file(velocity_file)
+        velocity_reader = csv.reader(velocity_file_handle)
         velocity_reader.next()
         for depths, velocitys, depth_answers, velocity_answers in map(None,
@@ -1432 +1434 @@
                 assert allclose(float(depths[i]), depth_answers[i]), msg
                 assert allclose(float(velocitys[i]), velocity_answers[i]), msg
-        
+
+        # clean up
+        depth_file_handle.close()
+        velocity_file_handle.close()
         #print "sww.filename",sww.filename 
         os.remove(sww.filename)
+        os.remove(depth_file)
+        os.remove(velocity_file)
 #-------------------------------------------------------------
 if __name__ == "__main__":