Changeset 9104

Timestamp:

May 5, 2014, 4:50:21 PM (11 years ago)

Author:

davies

Message:

Initial structure for levees

Location:

trunk

Files:

• anuga_core/source/anuga/shallow_water/shallow_water_domain.py (modified) (2 diffs)
• anuga_core/source/anuga/shallow_water/swDE1_domain_ext.c (modified) (8 diffs)
• anuga_work/development/gareth/tests/runup/runup.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -445 +445 @@
         self.edge_coordinates=self.get_edge_midpoint_coordinates()
 
+        # Hold elevation of riverwalls along cell edges
+        from anuga.config import max_float
+        self.riverwall_elevation=self.edge_coordinates[:,0]*0.0 - max_float
+
         # By default vertex values are NOT stored uniquely
         # for storage efficiency. We may override this (but not so important since
@@ -1290 +1294 @@
                                                Bed.centroid_values, 
                                                height.centroid_values,
-                                               Bed.vertex_values)
+                                               Bed.vertex_values,
+                                               self.riverwall_elevation)
 
             ## FIXME: This won't work in parallel since the timestep has not been updated to include other processors. 

trunk/anuga_core/source/anuga/shallow_water/swDE1_domain_ext.c

@@ -293 +293 @@
         double* bed_centroid_values,
         double* height_centroid_values,
-        double* bed_vertex_values) {
+        double* bed_vertex_values,
+        double* riverwall_elevation) {
     // Local variables
     double max_speed, length, inv_area, zl, zr;
@@ -386 +387 @@
             // Audusse magic 
             z_half=max(zl,zr);
+            // Account for riverwalls
+            z_half=max(z_half,riverwall_elevation[ki]);
 
             h_left= max(hle+zl-z_half,0.);
@@ -1573 +1576 @@
                                      optimise_dry_cells,
                                      stage.centroid_values,
-                                     bed.centroid_values)
+                                     bed.centroid_values,
+                                     domain.riverwall_elevation)
 
 
@@ -1606 +1610 @@
     *bed_centroid_values,
     *height_centroid_values,
-    *bed_vertex_values;
+    *bed_vertex_values,
+    *riverwall_elevation;
     
   double timestep, epsilon, H0, g;
@@ -1612 +1617 @@
     
   // Convert Python arguments to C
-  if (!PyArg_ParseTuple(args, "ddddOOOOOOOOOOOOOOOOOOOOOOiiOOOOOO",
+  if (!PyArg_ParseTuple(args, "ddddOOOOOOOOOOOOOOOOOOOOOOiiOOOOOOO",
             &timestep,
             &epsilon,
@@ -1644 +1649 @@
             &bed_centroid_values,
             &height_centroid_values,
-            &bed_vertex_values)) {
+            &bed_vertex_values,
+            &riverwall_elevation)) {
     report_python_error(AT, "could not parse input arguments");
     return NULL;
@@ -1677 +1683 @@
   CHECK_C_CONTIG(height_centroid_values);
   CHECK_C_CONTIG(bed_vertex_values);
+  CHECK_C_CONTIG(riverwall_elevation);
 
   int number_of_elements = stage_edge_values -> dimensions[0];
@@ -1716 +1723 @@
                      (double*) bed_centroid_values -> data,
                      (double*) height_centroid_values -> data,
-                     (double*) bed_vertex_values -> data);
+                     (double*) bed_vertex_values -> data,
+                     (double*) riverwall_elevation -> data);
   
   // Return updated flux timestep

trunk/anuga_work/development/gareth/tests/runup/runup.py

@@ -10 +10 @@
 from math import sin, pi, exp
 #from anuga.shallow_water_balanced2.swb2_domain import Domain as Domain
-#from anuga.shallow_water.shallow_water_domain import Domain as Domain
+from anuga.shallow_water.shallow_water_domain import Domain as Domain
 #from shallow_water_balanced_steve.swb_domain import *
 #import shallow_water_balanced_steve.swb_domain 
@@ -18 +18 @@
 #path.append('/home/gareth/storage/anuga_clean/anuga_jan12/trunk/anuga_work/development/gareth/balanced_basic')
 #from balanced_basic import *
-from bal_and import *
+#from bal_and import *
 #from anuga_tsunami import *
 #---------
@@ -29 +29 @@
 domain.set_datadir('.')                          # Use current folder
 #domain.set_store_centroids(True)
-#domain.set_flow_algorithm('DE1')
+domain.set_flow_algorithm('DE1')
 #domain.set_quantities_to_be_stored({'stage': 2, 'xmomentum': 2, 'ymomentum': 2, 'elevation': 1})
 #domain.set_store_vertices_uniquely(True)