Context Navigation

Changeset 9327

Timestamp:

Sep 8, 2014, 10:06:35 AM (11 years ago)

Author:

davies

Message:

Being more careful with timestep for riverwalls

Location:

trunk/anuga_core

Files:

-                      r9320
+                      r9327
                                  double weirScale,
                                  double s1, double s2,
+                                 double h1, double h2
+                                 double h1, double h2,
+                                 double *max_speed_local
                                 ){
     // Adjust the edgeflux to agree with a weir relation [including
 …
+    }
+    // Adjust the max speed
+    *max_speed_local = sqrt(g*maxhd) + abs(edgeflux[0])/(maxhd+1.0e-100);
     return 0;
+}
 …
                     adjust_edgeflux_with_weir(edgeflux, h_left_tmp, h_right_tmp, D->g,
                                               weir_height, Qfactor,
+                                              s1, s2, h1, h2);
+                    // NOTE: Should perhaps also adjust the wave-speed here?? Small chance of instability??
+                                              s1, s2, h1, h2, &max_speed_local);
+                }
+            }

r9256	r9327
30	30	bankwidth = 0.01 # Width of the bank regions -- note that these protrude into the channel
31	31	man_n=0.03 # Manning's n
32		l0 = 20.000 # Length scale associated with triangle side length in channel (min_triangle area = 0.5*l0^2)
	32	l0 = 50.000 # Length scale associated with triangle side length in channel (min_triangle area = 0.5*l0^2)
33	33
34	34	assert chan_width < floodplain_width, \

Note: See TracChangeset for help on using the changeset viewer.