Changeset 8375 for trunk/anuga_work/development/gareth/experimental/balanced_dev/swb2_domain_ext.c

Timestamp:

Mar 31, 2012, 2:47:12 PM (13 years ago)

Author:

davies

Message:

balanced_dev: fixed stack overflow problem, & new 'transect plot'
routine in util.py

File:

• trunk/anuga_work/development/gareth/experimental/balanced_dev/swb2_domain_ext.c (modified) (6 diffs)

trunk/anuga_work/development/gareth/experimental/balanced_dev/swb2_domain_ext.c

@@ -787 +787 @@
   double dqv[3], qmin, qmax, hmin, hmax, bedmax, stagemin;
   double hc, h0, h1, h2, beta_tmp, hfactor;
-  double xmom_centroid_store[number_of_elements], ymom_centroid_store[number_of_elements], dk, dv0, dv1, dv2, de[3];
-  double stage_centroid_store[number_of_elements];
-    
+  double dk, dv0, dv1, dv2, de[3];
+  //double xmom_centroid_store[number_of_elements], ymom_centroid_store[number_of_elements]
+  //double stage_centroid_store[number_of_elements];
+  
+  double *xmom_centroid_store, *ymom_centroid_store, *stage_centroid_store;
+
+  // Use malloc to avoid putting these variables on the stack, which can cause
+  // segfaults in large model runs
+  xmom_centroid_store = malloc(number_of_elements*sizeof(double));
+  ymom_centroid_store = malloc(number_of_elements*sizeof(double));
+  stage_centroid_store = malloc(number_of_elements*sizeof(double));
+ 
   if(extrapolate_velocity_second_order==1){
       // Replace momentum centroid with velocity centroid to allow velocity
@@ -819 +828 @@
 
     if (number_of_boundaries[k]==3)
+    //if (0==0)
     {
       // No neighbours, set gradient on the triangle to zero
@@ -1366 +1376 @@
       } 
   }
+
+  free(xmom_centroid_store);
+  free(ymom_centroid_store);
+  free(stage_centroid_store);
 
   return 0;
@@ -1859 +1873 @@
   number_of_elements = stage_centroid_values -> dimensions[0];  
 
+  //printf("In C before Extrapolate");
+  //e=1;
   // Call underlying computational routine
   e = _extrapolate_second_order_edge_sw(number_of_elements,
@@ -1884 +1900 @@
                    extrapolate_velocity_second_order);
 
+  //printf("In C before edges-to-vertices");
 
   //Extrapolate from edges to vertices
@@ -1896 +1913 @@
                                       (double *) elevation_vertex_values -> data, 
                                       extrapolate_velocity_second_order);
+  //printf("In C after edges-to-vertices");
 
   if (e == -1) {