Changeset 9011

Timestamp:

Oct 30, 2013, 7:35:11 PM (11 years ago)

Author:

davies

Message:

Bug fix

Location:

trunk/anuga_work/development/gareth

Files:

• experimental/bal_and/swb2_domain_ext.c (modified) (1 diff)
• tests/channel_floodplain/plotme.py (modified) (1 diff)
• tests/dam_break/plotme.py (modified) (1 diff)

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

@@ -158 +158 @@
   uh_left=q_left_rotated[1];
   vh_left=q_left_rotated[2];
-  //if(h_left>1.0e-03){
-  //  u_left = uh_left/(h_left+0.0e-03) ; //max(h_left, 1.0e-06);
-  //  uh_left=h_left*u_left;
-  //  vh_left=h_left/(h_left+0.0e-03)*vh_left;
-  //}else{
-  //  u_left=0.;
-  //  uh_left=0.;
-  //  vh_left=0.;
-  //}
+  if(h_left>1.0e-03){
+    u_left = uh_left/(hle+0.0e-03) ; //max(h_left, 1.0e-06);
+    uh_left=h_left*u_left;
+    vh_left=h_left/(hle+0.0e-03)*vh_left;
+  }else{
+    u_left=0.;
+    uh_left=0.;
+    vh_left=0.;
+  }
   // NOTE: using hle instead of h_left here seems to help prevent velocity spikes
-  u_left = _compute_speed(&uh_left, &hle, 
-              epsilon, h0, limiting_threshold);
+  //u_left = _compute_speed(&uh_left, &hle, 
+  //            epsilon, h0, limiting_threshold);
 
   w_right = q_right_rotated[0];
   uh_right = q_right_rotated[1];
   vh_right = q_right_rotated[2];
-  //if(h_right>1.0e-03){
-  //  u_right = uh_right/(h_right+0.0e-03);//max(h_right, 1.0e-06);
-  //  uh_right=h_right*u_right;
-  //  vh_right=h_right/(h_right+0.0e-03)*vh_right;
-  //}else{
-  //  u_right=0.;
-  //  uh_right=0.;//h_right*u_right;
-  //  vh_right=0.;
-  //}
+  if(h_right>1.0e-03){
+    u_right = uh_right/(hre+0.0e-03);//max(h_right, 1.0e-06);
+    uh_right=h_right*u_right;
+    vh_right=h_right/(hre+0.0e-03)*vh_right;
+  }else{
+    u_right=0.;
+    uh_right=0.;//h_right*u_right;
+    vh_right=0.;
+  }
   // NOTE: using hre instead of h_right here seems to help prevent velocity spikes
-  u_right = _compute_speed(&uh_right, &hre, 
-                epsilon, h0, limiting_threshold);
+  //u_right = _compute_speed(&uh_right, &hre, 
+  //              epsilon, h0, limiting_threshold);
 
   

trunk/anuga_work/development/gareth/tests/channel_floodplain/plotme.py

@@ -5 +5 @@
 
 # Time-index to plot outputs from
-index=40
-#index=900
+#index=40
+index=900
 
 #p2 = util.get_output('channel_floodplain1_bal_dev.sww', minimum_allowed_height=0.01)

trunk/anuga_work/development/gareth/tests/dam_break/plotme.py

@@ -11 +11 @@
 
 
-p_dev = util2.get_output('dam_break_20131018_165002/dam_break.sww', 0.001)
+p_dev = util2.get_output('dam_break_20131030_174145/dam_break.sww', 0.001)
 p2_dev=util2.get_centroids(p_dev, velocity_extrapolation=True)