Changeset 2567

Timestamp:

Mar 21, 2006, 2:34:42 PM (18 years ago)

Author:

ole

Message:

Cleanup and comments

File:

• inundation/pyvolution/shallow_water_ext.c (modified) (2 diffs)

inundation/pyvolution/shallow_water_ext.c

@@ -365 +365 @@
   int k;
   double hc;
-  double u, v, tmp_speed;  
+  double u, v, reduced_speed;  
 
   //Protect against initesimal and negative heights
-
   for (k=0; k<N; k++) {
     hc = wc[k] - zc[k];
 
     if (hc < minimum_allowed_height) {
-    //if (1) {
-      //if (hc < epsilon) {
       if (hc <= 0.0) {
         wc[k] = zc[k]; //Contain 'lost mass' error
@@ -380 +377 @@
         ymomc[k] = 0.0;
       } else {
-        //Try to see if calculated speeds would blow up 
+        //Reduce excessive speeds derived from division by small hc 
         //FIXME (Ole): This has not been written in Python
         u = xmomc[k]/hc;
         if (fabs(u) > maximum_allowed_speed) {
-          tmp_speed = maximum_allowed_speed * u/fabs(u);
-          //printf("WARNING: Speed (u) has been reduced from %.3f to %.3f\n", 
-          //     u, tmp_speed); 
-          xmomc[k] = tmp_speed * hc;
+          reduced_speed = maximum_allowed_speed * u/fabs(u);
+          //printf("Speed (u) has been reduced from %.3f to %.3f\n", 
+          //        u, reduced_speed);  
+          xmomc[k] = reduced_speed * hc;
         }
         
         v = ymomc[k]/hc;        
         if (fabs(v) > maximum_allowed_speed) {
-          tmp_speed = maximum_allowed_speed * v/fabs(v);        
-          //printf("WARNING: Speed (v) has been reduced from %.3f to %.3f\n",   
-          //     v, maximum_allowed_speed);     
-          ymomc[k] = tmp_speed * hc;      
+          reduced_speed = maximum_allowed_speed * v/fabs(v);    
+          //printf("Speed (v) has been reduced from %.3f to %.3f\n",   
+          //        v, reduced_speed);  
+          ymomc[k] = reduced_speed * hc;          
         }       
-        
-
       }
     }
-
   }
   return 0;