Changeset 1104

Timestamp:

Mar 17, 2005, 7:25:53 PM (20 years ago)

Author:

ole

Message:

Mainly comments

Location:

inundation/ga/storm_surge/pyvolution

Files:

• least_squares.py (modified) (3 diffs)
• util.py (modified) (1 diff)
• wiki/issues.txt (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -86 +86 @@
                  concatinate_attributelist
     
-    # load in the .tsh file
-    #FIXME (Ole): mesh_origin should be extracted here
     mesh_dict = mesh_file_to_mesh_dictionary(mesh_file)
     vertex_coordinates = mesh_dict['vertices']
@@ -104 +102 @@
    
     # load in the .pts file
-    #FIXME (Ole): data_origin should be extracted here
     try:
         point_dict = load_points_file(point_file,
@@ -117 +114 @@
     title_list,point_attributes = concatinate_attributelist(point_dict['attributelist'])
     
-    if point_dict.has_key('geo_reference')and not point_dict['geo_reference'] is None:
+    if point_dict.has_key('geo_reference') and not point_dict['geo_reference'] is None:
         data_origin = point_dict['geo_reference'].get_origin()
     else:
         data_origin = (56, 0, 0) #FIXME(DSG-DSG)
         
-    if mesh_dict.has_key('geo_reference')and not mesh_dict['geo_reference'] is None:
+    if mesh_dict.has_key('geo_reference') and not mesh_dict['geo_reference'] is None:
         mesh_origin = mesh_dict['geo_reference'].get_origin()
     else:

inundation/ga/storm_surge/pyvolution/util.py

@@ -1134 +1134 @@
     #Input checks
     try:
-        points = array(points).astype(Float)       
+        #FIXME: This is where it can die due to lack of memeory
+        #Maybe comment out and test for Numeric type
+        points = array(points).astype(Float)
     except:
         msg = 'Points could not be converted to Numeric array'
-        raise msg        
-        
+        raise msg
+
+    #if verbose: print 'Checking input to separate_points_by_polygon 2' 
     try:
-        polygon = array(polygon).astype(Float)             
+        #FIXME: SAme thing
+        polygon = array(polygon).astype(Float)
     except:
         msg = 'Polygon could not be converted to Numeric array'
         raise msg               
 
+    if verbose: print 'check'
+    
     assert len(polygon.shape) == 2,\
        'Polygon array must be a 2d array of vertices'

inundation/ga/storm_surge/pyvolution/wiki/issues.txt

@@ -2 +2 @@
 OPEN ISSUES:
 ------------
+Issue: finaltime should be renamed 'duration'
+
+
 Issue (least_squares): The current is-a-point-in-a-triangle algorithm
 is slow if a point is outside of the mesh.  It will check each