Changeset 9056 for trunk/anuga_work/development/gareth/experimental/bal_and

Timestamp:

Mar 3, 2014, 9:58:02 AM (11 years ago)

Author:

davies

Message:

Minor updates to validation tests

Location:

trunk/anuga_work/development/gareth/experimental/bal_and

Files:

• swb2_domain.py (modified) (1 diff)
• swb2_domain_ext.c (modified) (7 diffs)

trunk/anuga_work/development/gareth/experimental/bal_and/swb2_domain.py

@@ -73 +73 @@
 
         self.beta_w=1.0
-        self.beta_w_dry=0.4
+        self.beta_w_dry=0.0
         self.beta_uh=1.0
         self.beta_uh_dry=0.0

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

@@ -242 +242 @@
       if(i==0) edgeflux[i] += (s_max*s_min)*(max(q_right_rotated[i],ze) - max(q_left_rotated[i],ze));
       //if(i==0) edgeflux[i] += (s_max*s_min)*(hre - hle);
-      if(i==1) edgeflux[i] += (s_max*s_min)*(uh_right - uh_left);
-      if(i==2) edgeflux[i] += (s_max*s_min)*(vh_right - vh_left);
+      if((i==1)) edgeflux[i] += (s_max*s_min)*(uh_right - uh_left);
+      //if((i==1)) edgeflux[i] += (s_max*s_min)*(uh_right/(h_right+1.0e-08)*hre - uh_left/(h_left+1.0e-08)*hle);
+      if((i==2)) edgeflux[i] += (s_max*s_min)*(vh_right - vh_left);
+      //if((i==2)) edgeflux[i] += (s_max*s_min)*(vh_right/(h_right+1.0e-08)*hre - vh_left/(h_left+1.0e-08)*hle);
 
       edgeflux[i] *= inverse_denominator;
@@ -538 +540 @@
     for(k=0; k<number_of_elements; k++){
         hc = max(stage_centroid_values[k] - bed_centroid_values[k],0.);
-        stage_explicit_update[k]=0.;
-        xmom_explicit_update[k]=0.;
-        ymom_explicit_update[k]=0.;
+        //stage_explicit_update[k]=0.;
+        //xmom_explicit_update[k]=0.;
+        //ymom_explicit_update[k]=0.;
 
         for(i=0;i<3;i++){
@@ -751 +753 @@
   double dx1, dx2, dy1, dy2, dxv0, dxv1, dxv2, dyv0, dyv1, dyv2, dq0, dq1, dq2, area2, inv_area2, dpth,momnorm;
   double dqv[3], qmin, qmax, hmin, hmax, bedmax,bedmin, stagemin;
-  double hc, h0, h1, h2, beta_tmp, hfactor, xtmp, ytmp, weight, tmp;
+  double hc, h0, h1, h2, beta_tmp, hfactor, xtmp, ytmp, weight, tmp, v0, v1, v2, vmax,vmin, vc;
   double dk, dv0, dv1, dv2, de[3], demin, dcmax, r0scale, vel_norm, l1, l2, a_tmp, b_tmp, c_tmp,d_tmp;
   
@@ -845 +847 @@
   // condition) set its momentum to zero too. Aim is to prevent local 'pits'
   // with a non-zero water surface gradient building up momentum over time
-  for (k=0; k<number_of_elements;k++){
-
-      k3=k*3;
-      k0 = surrogate_neighbours[k3];
-      k1 = surrogate_neighbours[k3 + 1];
-      k2 = surrogate_neighbours[k3 + 2];
-
-      if((height_centroid_values[k0] < minimum_allowed_height | k0==k) &
-         (height_centroid_values[k1] < minimum_allowed_height | k1==k) &
-         (height_centroid_values[k2] < minimum_allowed_height | k2==k)){
-              xmom_centroid_store[k] = 0.;
-              xmom_centroid_values[k] = 0.;
-              ymom_centroid_store[k] = 0.;
-              ymom_centroid_values[k] = 0.;
-
-      }
-  }
+  //for (k=0; k<number_of_elements;k++){
+  //
+  //    k3=k*3;
+  //    k0 = surrogate_neighbours[k3];
+  //    k1 = surrogate_neighbours[k3 + 1];
+  //    k2 = surrogate_neighbours[k3 + 2];
+  //
+  //    if((height_centroid_values[k0] < minimum_allowed_height | k0==k) &
+  //       (height_centroid_values[k1] < minimum_allowed_height | k1==k) &
+  //       (height_centroid_values[k2] < minimum_allowed_height | k2==k)){
+  //            xmom_centroid_store[k] = 0.;
+  //            xmom_centroid_values[k] = 0.;
+  //            ymom_centroid_store[k] = 0.;
+  //            ymom_centroid_values[k] = 0.;
+
+  //    }
+  //}
 
   // Begin extrapolation routine
@@ -1052 +1054 @@
       hmin = min(min(h0, min(h1, h2)), hc);
       hmax = max(max(h0, max(h1, h2)), hc);
+
+      //vc = sqrt(xmom_centroid_values[k]*xmom_centroid_values[k]+
+      //          ymom_centroid_values[k]*ymom_centroid_values[k]);
+      //v0 = sqrt(xmom_centroid_values[k0]*xmom_centroid_values[k0]+
+      //          ymom_centroid_values[k0]*ymom_centroid_values[k0]);
+      //v1 = sqrt(xmom_centroid_values[k1]*xmom_centroid_values[k1]+
+      //          ymom_centroid_values[k1]*ymom_centroid_values[k1]);
+      //v2 = sqrt(xmom_centroid_values[k2]*xmom_centroid_values[k2]+
+      //          ymom_centroid_values[k2]*ymom_centroid_values[k2]);
+      //vmax=max(max(v0*h0,max(v1*h1,v2*h2)),vc*hc);
+      //vmin=min(min(v0*h0,min(v1*h1,v2*h2)),vc*hc);
 
       // Look for strong changes in cell depth as an indicator of near-wet-dry
@@ -1075 +1088 @@
       // Set hfactor to 0 smoothly as hmin --> minumum_allowed_height 
       hfactor=min( 1.2*max(hmin-minimum_allowed_height,0.)/(max(hmin,0.)+1.*minimum_allowed_height), hfactor);
+
+      //hfactor=min(1.5*max(vmin,0.)/(max(vmax,0.)+1.0e-06), hfactor);
       //hfactor=min( 1.2*max(hc-minimum_allowed_height,0.)/(max(hc,0.)+1.*minimum_allowed_height), hfactor);
 
@@ -1252 +1267 @@
 
       // Limit the gradient
-      limit_gradient(dqv, qmin, qmax, beta_tmp);
+       limit_gradient(dqv, qmin, qmax, beta_tmp);
       
       for (i=0;i<3;i++)