Changeset 4665 for anuga_core/source/anuga/shallow_water/data_manager.py

Timestamp:

Aug 8, 2007, 9:39:22 AM (17 years ago)

Author:

duncan

Message:

working on ticket#176

File:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (15 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -2175 +2175 @@
         ascid.close()
         fid.close()
-
         return basename_out
 
@@ -4907 +4906 @@
         If you get both, do a convertion from the old to the new.
         
-        If you only get new_origin, the points are absolute, convert to relative
+        If you only get new_origin, the points are absolute,
+        convert to relative
         
         if you only get the current_origin the points are relative, store
@@ -4928 +4928 @@
         
         number_of_points = len(points_utm)   
-        volumes = array(volumes)
+        volumes = array(volumes)  
+        points_utm = array(points_utm)
 
         # given the two geo_refs and the points, do the stuff
@@ -4951 +4952 @@
     
         # This will put the geo ref in the middle
-        #geo_ref = Geo_reference(refzone,(max(x)+min(x))/2.0,(max(x)+min(y))/2.)
+        #geo_ref=Geo_reference(refzone,(max(x)+min(x))/2.0,(max(x)+min(y))/2.)
+        
         x =  points[:,0]
         y =  points[:,1]
@@ -5122 +5124 @@
         #Title
         fid.write('time' +d+ 'HA depth m'+d+ \
-                      'UA momentum East x m/sec' +d+ 'VA momentum North y m/sec' \
+                 'UA momentum East x m/sec' +d+ 'VA momentum North y m/sec' \
                       + "\n")
         for HA, UA, VA in map(None, mux['HA'], mux['UA'], mux['VA']):
@@ -5231 +5233 @@
     if extra_info <>'':
         extra_info = '_'+str(extra_info)
-    screen_output_name = dir_name + "screen_output%s%s%s.txt" %(myid,numprocs,extra_info)
-    screen_error_name = dir_name + "screen_error%s%s%s.txt" %(myid,numprocs,extra_info)
+    screen_output_name = dir_name + "screen_output%s%s%s.txt" %(myid,
+                                                                numprocs,
+                                                                extra_info)
+    screen_error_name = dir_name + "screen_error%s%s%s.txt" %(myid,
+                                                              numprocs,
+                                                              extra_info)
     print screen_output_name
     #used to catch screen output to file
@@ -5323 +5329 @@
     might be a better way to do this using CSV module Writer and writeDict
     
-    writes file to "output_dir" unless "completed" is in kwargs, then it writes to 
-    "file_name" kwargs 
+    writes file to "output_dir" unless "completed" is in kwargs, then
+    it writes to "file_name" kwargs
 
     """
@@ -5401 +5407 @@
         fid.close()
     else:
-        #backup plan, if header is different and has completed will append info to 
+        #backup plan,
+        # if header is different and has completed will append info to 
         #end of details_temp.cvs file in output directory
         file = str(kwargs['output_dir'])+'detail_temp.csv'
@@ -5431 +5438 @@
                                                  verbose=False)
 
-    filename is a NetCDF sww file containing ANUGA model output.                                                       
-    Optional arguments polygon and time_interval restricts the maximum runup calculation
+    filename is a NetCDF sww file containing ANUGA model output.    
+    Optional arguments polygon and time_interval restricts the maximum
+    runup calculation
     to a points that lie within the specified polygon and time interval.
 
@@ -5465 +5473 @@
 
     filename is a NetCDF sww file containing ANUGA model output.
-    Optional arguments polygon and time_interval restricts the maximum runup calculation
+    Optional arguments polygon and time_interval restricts the maximum
+    runup calculation
     to a points that lie within the specified polygon and time interval.
 
@@ -5495 +5504 @@
     
 
-    Algorithm is as in get_maximum_inundation_elevation from shallow_water_domain
+    Algorithm is as in get_maximum_inundation_elevation from
+    shallow_water_domain
     except that this function works with the sww file and computes the maximal
     runup height over multiple timesteps. 
     
-    Optional arguments polygon and time_interval restricts the maximum runup calculation
-    to a points that lie within the specified polygon and time interval. Polygon is
+    Optional arguments polygon and time_interval restricts the
+    maximum runup calculation
+    to a points that lie within the specified polygon and time interval.
+    Polygon is
     assumed to be in (absolute) UTM coordinates in the same zone as domain.
 
@@ -5561 +5573 @@
     
     
-        # Here's where one could convert nodal information to centroid information
+        # Here's where one could convert nodal information to centroid
+        # information
         # but is probably something we need to write in C.
         # Here's a Python thought which is NOT finished!!!
@@ -5574 +5587 @@
             msg = 'polygon must be a sequence of points.'
             assert len(polygon[0]) == 2, msg
-            # FIXME (Ole): Make a generic polygon input check in polygon.py and call it here
+            # FIXME (Ole): Make a generic polygon input check in polygon.py
+            # and call it here
             
             points = concatenate((x[:,NewAxis], y[:,NewAxis]), axis=1)
@@ -5600 +5614 @@
             msg = 'time_interval must be a sequence of length 2.'
             assert len(time_interval) == 2, msg
-            msg = 'time_interval %s must not be decreasing.' %(time_interval)        
+            msg = 'time_interval %s must not be decreasing.' %(time_interval)
             assert time_interval[1] >= time_interval[0], msg
             
@@ -5633 +5647 @@
         for i in timesteps:
             if use_centroid_values is True:
-                stage_i = get_centroid_values(stage[i,:], volumes)                
+                stage_i = get_centroid_values(stage[i,:], volumes)   
             else:
                 stage_i = stage[i,:]