Rev | Line | |
---|
[26740] | 1 | Index: ../trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp (revision 26496)
|
---|
| 4 | +++ ../trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp (revision 26497)
|
---|
| 5 | @@ -403,7 +403,7 @@
|
---|
| 6 | -beta*sqrt(vx*vx+vy*vy)
|
---|
| 7 | +ieb
|
---|
| 8 | +storage*head_old/dt
|
---|
| 9 | - +meltrate*gap/rho_ice*(dgapxx+dgapyy)
|
---|
| 10 | + +pow(1,-5)*(dgapxx+dgapyy)
|
---|
| 11 | )*basis[i];
|
---|
| 12 |
|
---|
| 13 |
|
---|
| 14 | @@ -659,8 +659,8 @@
|
---|
| 15 | meltrate/rho_ice
|
---|
| 16 | -A*pow(fabs(pressure_ice-pressure_water),n-1)*(pressure_ice-pressure_water)*lc
|
---|
| 17 | +beta*sqrt(vx*vx+vy*vy)
|
---|
| 18 | - +(meltrate*gap/rho_ice*(dgapxx+dgapyy))
|
---|
| 19 | - ));
|
---|
| 20 | + +pow(1,-5)*(dgapxx+dgapyy))
|
---|
| 21 | + );
|
---|
| 22 |
|
---|
| 23 |
|
---|
| 24 | /*TEST with linear creep rate*/
|
---|
Note:
See
TracBrowser
for help on using the repository browser.