Changeset 981

Timestamp:

Mar 1, 2005, 1:31:28 PM (20 years ago)

Author:

ole

Message:

Work with georeferencing and documentation

Location:

inundation/ga/storm_surge/pyvolution

Files:

• data_manager.py (modified) (1 diff)
• documentation/assumptions.txt (modified) (1 diff)
• least_squares.py (modified) (10 diffs)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1144 +1144 @@
     Lat and lon are assuemd to be in decimal degrees
 
-    origin is a 5-tuple with geo referenced
-    UTM coordinates (zone, easting, northing, false_easting, false_northing)
+    origin is a 3-tuple with geo referenced
+    UTM coordinates (zone, easting, northing)
 
     nc format has values organised as HA[TIME, LATITUDE, LONGITUDE]

inundation/ga/storm_surge/pyvolution/documentation/assumptions.txt

@@ -14 +14 @@
 one UTM zone. However, the computation will use that of the mesh.
 
-The dataflow is: (See data_manager.py)
+The dataflow is: (See data_manager.py and from scenarios)
 
 
+Simulation scenarios
+--------------------
+
+
+Sub directories contain scrips and derived files for each simulation.
+The directory ../source_data contains large source files such as
+DEMs provided externally as well as MOST tsunami simulations to be used 
+as boundary conditions.
+
+Manual steps are:
+  Creation of DEMs from argcview (.asc + .prj)
+  Creation of mesh from pmesh (.tsh)
+  Creation of tsunami simulations from MOST (.nc)
+
+  
+Typical scripted steps are
+
+  prepare_dem.py:  Convert asc and prj files supplied by arcview to 
+                   native dem and pts formats
+  
+  prepare_pts.py: Convert netcdf output from MOST to an sww file suitable
+                  as boundary condition
+                  
+  prepare_mesh.py: Merge DEM (pts) and mesh (tsh) using least squares 
+                   smoothing. The outputs are tsh files with elevation data.
+                   
+  run_simulation.py: Use the above together with various parameters to 
+                     run inundation simluation.                         
+                                
  
 

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -60 +60 @@
                      alpha=DEFAULT_ALPHA, verbose= False,
                      expand_search = False,
-                     origin = None,
-                     mesh_origin=None):
+                     data_origin = None,
+                     mesh_origin = None):
     """
     Given a mesh file (tsh) and a point attribute file (xya), fit
@@ -67 +67 @@
     results.
     
-    If origin is not None it is assumed to be
-    a 5-tuple with geo referenced
-    UTM coordinates (zone, easting, northing, false_easting, false_northing)
+
+    If data_origin is not None it is assumed to be
+    a 3-tuple with geo referenced
+    UTM coordinates (zone, easting, northing)
     
     mesh_origin is the same but refers to the input tsh file.
-    FIXME: When that format contains it own origin, this parameter can go.
+    FIXME: When the tsh format contains it own origin, these parameters can go.
+    FIXME: And both origins should be obtained from the specified files.
     """
     
@@ -80 +82 @@
     
     # 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']
@@ -88 +91 @@
     if verbose:print "tsh file loaded"
    
-    # load in the .xya file
-    #FIXME (Ole): Maybe data origin should be extracted here
+    # load in the .pts file
+    #FIXME (Ole): data_origin should be extracted here
     try:
         point_dict = load_points_file(point_file,delimiter = ',')
@@ -98 +101 @@
     if verbose: print "points file loaded"
 
-
     
     if verbose:print "fitting to mesh"
@@ -107 +109 @@
                     alpha = alpha,
                     verbose = verbose,
-                    expand_search = expand_search)
+                    expand_search = expand_search,
+                    data_origin = data_origin,
+                    mesh_origin = mesh_origin)
     if verbose:print "finished fitting to mesh"
     
@@ -124 +128 @@
         mesh_dict['vertex_attributes'] = new_point_attributes
         mesh_dict['vertex_attribute_titles'] = title_list
-    
+
+    #FIXME (Ole): Remember to output mesh_origin as well    
     export_triangulation_file(mesh_output_file, mesh_dict)
         
@@ -134 +139 @@
                 alpha = DEFAULT_ALPHA,
                 verbose = False,
-                expand_search = False):
+                expand_search = False,
+                data_origin = None,
+                mesh_origin = None):
     """
     Fit a smooth surface to a triangulation,
@@ -154 +161 @@
 
           point_attributes: Vector or array of data at the point_coordinates.
+
+          data_origin and mesh_origin are 3-tuples consisting of
+          UTM zone, easting and northing. If specified
+          point coordinates and vertex coordinates are assumed to be
+          relative to their respective origins. 
+          
     """
     interp = Interpolation(vertex_coordinates,
@@ -160 +173 @@
                            alpha = alpha,
                            verbose = verbose,
-                           expand_search = expand_search)
+                           expand_search = expand_search,
+                           data_origin = data_origin,
+                           mesh_origin = mesh_origin)
                            # expand_search = False)