Changeset 4567

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.

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (4 diffs)
• test_data_manager.py (modified) (3 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

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -7080 +7080 @@
         runup = get_maximum_inundation_elevation(swwfile)
         location = get_maximum_inundation_location(swwfile)
+        #print runup, location
         assert allclose(runup, 11)
         assert allclose(location[0], 15)
@@ -7086 +7087 @@
         runup = get_maximum_inundation_elevation(swwfile, time_interval=[45,50])
         location = get_maximum_inundation_location(swwfile, time_interval=[45,50])
+        #print runup, location        
         assert allclose(runup, 1)
         assert allclose(location[0], 65)
@@ -7093 +7095 @@
         runup = get_maximum_inundation_elevation(swwfile, polygon=p)
         location = get_maximum_inundation_location(swwfile, polygon=p)
+        #print runup, location        
         assert allclose(runup, 4)
         assert allclose(location[0], 50)