Changeset 4281

Timestamp:

Feb 26, 2007, 11:28:54 AM (18 years ago)

Author:

duncan

Message:

working on updated urs2sww

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (1 diff)
• test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4565 +4565 @@
     # instanciate urs_points of the three mux files.
     mux = {}
-    #quality_slices = {}
     for quantity, file in map(None, quantities, files_in):
         mux[quantity] = Urs_points(file)
-        #quality_slices[quantity] = []
-        #for slice in mux[quantity]:
-        #    quality_slices[quantity].append(slice)
         
     # FIXME: check that the depth is the same. (hashing)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -5481 +5481 @@
         urs_ungridded2sww(base_name, mean_stage=tide)
         self.delete_mux(files)
-        #os.remove( base_name + '.sww')
+        os.remove( base_name + '.sww')
+        # extend this so it interpolates onto the boundary.
+        # have it fail if there is NaN
+        
+    def davids_test_points_urs_ungridded2sww(self):
+        tide = 5.0
+        base_name = 'o'
+        urs_ungridded2sww(base_name, mean_stage=tide)
+        os.remove( base_name + '.sww')
+        # extend this so it interpolates onto the boundary.
+        # have it fail if there is NaN
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_URS_points_needed')
+    #suite = unittest.makeSuite(Test_Data_Manager,'davids_test_points_urs_ungridded2sww')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_urs_ungridded2swwII')
     #suite = unittest.makeSuite(Test_Data_Manager,'visual_test_URS_points_needed_and_urs_ungridded2sww')