Changeset 4191


Ignore:
Timestamp:
Jan 23, 2007, 5:44:25 PM (17 years ago)
Author:
ole
Message:

Fiddling

File:
1 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/shallow_water/shallow_water_ext.c

    r4001 r4191  
    455455    //computed by the gradient limiter (both 1st or 2nd order)
    456456    //
    457     //If hmin > dz/2 then alpha = 1 and the bed will have no effect
     457    //If hmin > dz/alpha_balance then alpha = 1 and the bed will have no effect
    458458    //If hmin < 0 then alpha = 0 reverting to constant height above bed.
    459 
    460 
    461     if (dz > 0.0)
    462       //if (hmin<0.0)
    463       //        alpha = 0.0;
    464       //else
    465       //  alpha = max( min( hc[k]/dz, 1.0), 0.0 );
    466       alpha = max( min( alpha_balance*hmin/dz, 1.0), 0.0 );
    467     else
     459    //The parameter alpha_balance==2 by default
     460
     461
     462    if (dz > 0.0) {
     463      alpha = max( min( alpha_balance*hmin/dz, 1.0), 0.0 );     
     464    } else {
    468465      alpha = 1.0;  //Flat bed
     466    }
     467
     468   
     469    //printf("k=%d, hmin=%.2f, dz=%.2f, alpha=%.2f, alpha_balance=%.2f\n",
     470    //     k, hmin, dz, alpha, alpha_balance);
    469471     
    470      
     472         
    471473    //alpha = 1.0;  //Always deep FIXME: This actually looks good now
     474    //alpha = 0.2;
    472475
    473476    //printf("dz = %.3f, alpha = %.8f\n", dz, alpha);
Note: See TracChangeset for help on using the changeset viewer.