Changeset 8880

Timestamp:

Jun 3, 2013, 5:05:31 PM (11 years ago)

Author:

davies

Message:

Removing redundant code from 'tsunami' flow algorithm

Location:

trunk

Files:

• anuga_core/source/anuga/shallow_water/swb2_domain_ext.c (modified) (8 diffs)
• anuga_work/development/gareth/tests/parabolic/parabolic.py (modified) (2 diffs)
• anuga_work/development/gareth/tests/runup_sinusoid/runup_sinusoid.py (modified) (3 diffs)

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

@@ -230 +230 @@
     }
 
-    *pressure_flux = 0.5*g*( s_max*h_left*h_left -s_min*h_right*h_right)*inverse_denominator;
+    *pressure_flux = 0.;//0.5*g*( s_max*h_left*h_left -s_min*h_right*h_right)*inverse_denominator;
 
     // Maximal wavespeed
@@ -294 +294 @@
     double *max_bed_edgevalue, *min_bed_edgevalue;
 
-    max_bed_edgevalue = malloc(number_of_elements*sizeof(double));
-    min_bed_edgevalue = malloc(number_of_elements*sizeof(double));
+    //max_bed_edgevalue = malloc(number_of_elements*sizeof(double));
+    //min_bed_edgevalue = malloc(number_of_elements*sizeof(double));
     // Start computation
     call++; // Flag 'id' of flux calculation for this timestep
@@ -307 +307 @@
 
     // Compute minimum bed edge value on each triangle
-    for (k = 0; k < number_of_elements; k++){
-        max_bed_edgevalue[k] = max(bed_edge_values[3*k], 
-                                   max(bed_edge_values[3*k+1], bed_edge_values[3*k+2]));
-        min_bed_edgevalue[k] = min(bed_edge_values[3*k], 
-                                   min(bed_edge_values[3*k+1], bed_edge_values[3*k+2]));
-    
-    }
+    //for (k = 0; k < number_of_elements; k++){
+    //    max_bed_edgevalue[k] = max(bed_edge_values[3*k], 
+    //                               max(bed_edge_values[3*k+1], bed_edge_values[3*k+2]));
+    //    min_bed_edgevalue[k] = min(bed_edge_values[3*k], 
+    //                               min(bed_edge_values[3*k+1], bed_edge_values[3*k+2]));
+    //
+    //}
 
 
@@ -551 +551 @@
     } // End triangle k
 
-    free(max_bed_edgevalue);
-    free(min_bed_edgevalue);
+    //free(max_bed_edgevalue);
+    //free(min_bed_edgevalue);
 
     return timestep;
@@ -735 +735 @@
   ymom_centroid_store = malloc(number_of_elements*sizeof(double));
   stage_centroid_store = malloc(number_of_elements*sizeof(double));
-  min_elevation_edgevalue = malloc(number_of_elements*sizeof(double));
+  //min_elevation_edgevalue = malloc(number_of_elements*sizeof(double));
   max_elevation_edgevalue = malloc(number_of_elements*sizeof(double));
-  count_wet_neighbours = malloc(number_of_elements*sizeof(int));
+  //count_wet_neighbours = malloc(number_of_elements*sizeof(int));
  
   if(extrapolate_velocity_second_order==1){
@@ -751 +751 @@
           ymom_centroid_values[k] = ymom_centroid_values[k]/dk;
 
-          min_elevation_edgevalue[k] = min(elevation_edge_values[3*k], 
-                                           min(elevation_edge_values[3*k+1],
-                                               elevation_edge_values[3*k+2]));
+          //min_elevation_edgevalue[k] = min(elevation_edge_values[3*k], 
+          //                                 min(elevation_edge_values[3*k+1],
+          //                                     elevation_edge_values[3*k+2]));
           max_elevation_edgevalue[k] = max(elevation_edge_values[3*k], 
                                            max(elevation_edge_values[3*k+1],
@@ -762 +762 @@
 
   // Count how many 'fully submerged' neighbours the cell has
-  for(k=0; k<number_of_elements;k++){ 
-      count_wet_neighbours[k]=0;
-      for (i=0; i<3; i++){
-        ktmp = surrogate_neighbours[3*k+i];              
-        if(stage_centroid_values[ktmp] > max_elevation_edgevalue[ktmp]){
-            count_wet_neighbours[k]+=1;
-        }
-      }
-  }
+  //for(k=0; k<number_of_elements;k++){ 
+  //    count_wet_neighbours[k]=0;
+  //    for (i=0; i<3; i++){
+  //      ktmp = surrogate_neighbours[3*k+i];              
+  //      if(stage_centroid_values[ktmp] > max_elevation_edgevalue[ktmp]){
+  //          count_wet_neighbours[k]+=1;
+  //      }
+  //    }
+  //}
 
   // Begin extrapolation routine
@@ -1266 +1266 @@
   free(ymom_centroid_store);
   free(stage_centroid_store);
-  free(min_elevation_edgevalue);
+  //free(min_elevation_edgevalue);
   free(max_elevation_edgevalue);
-  free(count_wet_neighbours);
+  //free(count_wet_neighbours);
   return 0;
 }           

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

@@ -8 +8 @@
 import numpy
 
-from balanced_dev import *
+#from balanced_dev import *
 #from anuga_tsunami import *
 #from balanced_basic import *
 #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
 #---------
 #Setup computational domain
@@ -23 +23 @@
 domain.set_quantities_to_be_stored({'stage': 2, 'xmomentum': 2, 'ymomentum': 2, 'elevation': 1})
 domain.set_minimum_allowed_height(0.001)
+domain.set_flow_algorithm('tsunami')
 # Time stepping
 #domain.set_timestepping_method('euler') # Default

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

@@ -14 +14 @@
 #from swb2_domain import *
 #from balanced_basic import *
-from balanced_dev import *
+#from balanced_dev import *
 #from anuga_tsunami import *
 
@@ -22 +22 @@
 points, vertices, boundary = anuga.rectangular_cross(20,20, len1=1., len2=1.)
 
-domain=Domain(points,vertices,boundary)    # Create Domain
+domain=anuga.Domain(points,vertices,boundary)    # Create Domain
 domain.set_name('runup_sinusoid_v2')                         # Output to file runup.sww
 #domain.set_timestepping_method('euler')
+domain.set_flow_algorithm('tsunami')
 #------------------
 # Define topography
 #------------------
 
-### Pathological
-scale_me=100.0
-boundary_ws=-0.1999
+#### Pathological
+#scale_me=100.0
+#boundary_ws=-0.2
+#init_ws=-0.2
+#bumpiness=50. # Higher = shorter wavelength oscillations in topography
+#tstep=0.002
+#lasttime=1.1
+
+### Sensible
+scale_me=1.0
+boundary_ws=-0.1
 init_ws=-0.2
 bumpiness=50. # Higher = shorter wavelength oscillations in topography
-tstep=0.002
-lasttime=1.1
-
-### Sensible
-#scale_me=1.0
-#boundary_ws=-0.1
-#init_ws=-0.2
-#bumpiness=50. # Higher = shorter wavelength oscillations in topography
-#tstep=0.2
-#lasttime=40.
+tstep=0.2
+lasttime=40.
 
 #domain.minimum_allowed_height=domain.minimum_allowed_height*scale_me # Seems needed to make the algorithms behave
@@ -108 +109 @@
     print 'Peak velocity is: ', vv.max(), vv.argmax(), dd[vv.argmax()]
     print 'Volume is', sum(dd_raw*domain.areas)    
-    print 'Volume less flux int', sum(dd_raw*domain.areas) - domain.boundary_flux_integral
+    #print 'Volume less flux int', sum(dd_raw*domain.areas) - domain.boundary_flux_integral