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

Timestamp:

Jun 28, 2007, 5:27:17 PM (17 years ago)

Author:

ole

Message:

Thoughts on centroid values - this is probably not going to be useful as nodal values will be good enough given the inherent discretisation error.

File:

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

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -89 +89 @@
      pmesh_to_domain_instance
 from anuga.abstract_2d_finite_volumes.util import get_revision_number, \
-     remove_lone_verts, sww2timeseries
+     remove_lone_verts, sww2timeseries, get_centroid_values
 from anuga.load_mesh.loadASCII import export_mesh_file
 # formula mappings
@@ -5448 +5448 @@
 
 def get_maximum_inundation_data(filename, polygon=None, time_interval=None,
+                                use_centroid_values=False,
                                 verbose=False):
     """Compute maximum run up height from sww file.
@@ -5513 +5514 @@
     elevation = fid.variables['elevation'][:] 
     stage = fid.variables['stage'][:]
+
+
+    # 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!!!
+    if use_centroid_values is True:
+        x = get_centroid_values(x, volumes)
+        y = get_centroid_values(y, volumes)    
+        elevation = get_centroid_values(elevation, volumes)    
 
 
@@ -5574 +5584 @@
     maximal_runup_location = None
     for i in timesteps:
-        depth = stage[i,:] - elevation 
+        if use_centroid_values is True:
+            stage_i = get_centroid_values(stage[i,:], volumes)                
+        else:
+            stage_i = stage[i,:]
+            
+        depth = stage_i  - elevation 
     
         # Get wet nodes i.e. nodes with depth>0 within given region and timesteps