Changeset 7675 for anuga_core/source/anuga/abstract_2d_finite_volumes/gauge.py

Timestamp:

Apr 6, 2010, 8:23:54 PM (14 years ago)

Author:

hudson

Message:

Ticket 113 is complete, and all tests pass.
A centroid list is built by Interpolation_function as it calculates the interpolation matrix, and this is passed out as extra quantities which are output into the gauge.csv file.

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/gauge.py (modified) (4 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/gauge.py

@@ -190 +190 @@
                 quake_time = time + quake_offset_time
                 points_list = [quake_time, quake_time/3600.]# fudge around SWW time bug
-                point_quantities = callable_sww(time,point_i) # __call__ is overridden
-                                
+                point_quantities = callable_sww(time, point_i) # __call__ is overridden
+                            
                 for quantity in quantities:
                     if quantity == NAN:
@@ -197 +197 @@
                                      % callable_sww.get_name)
                     else:
+                        #core quantities that are exported from the interpolator     
                         if quantity == 'stage':
                             points_list.append(point_quantities[0])
@@ -208 +209 @@
                         if quantity == 'ymomentum':
                             points_list.append(point_quantities[3])
-                            
+
+                        #derived quantities that are calculated from the core ones
                         if quantity == 'depth':
                             points_list.append(point_quantities[0] 
@@ -237 +239 @@
                             points_list.append(calc_bearing(point_quantities[2],
                                                             point_quantities[3]))
-
+                        if quantity == 'xcentroid':
+                            points_list.append(callable_sww.centroids[point_i][0])
+
+                        if quantity == 'ycentroid':
+                            points_list.append(callable_sww.centroids[point_i][1])
+                                                        
                 points_writer[point_i].writerow(points_list)