source: issm/oecreview/Archive/21724-22754/ISSM-22420-22421.diff

Last change on this file was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754

File size: 1.2 KB
RevLine 
[22755]1Index: ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 22420)
4+++ ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 22421)
5@@ -422,14 +422,19 @@
6 haf_eps=10.;
7 if(groundedice-calvinghaf<=-haf_eps){
8 // ice floats freely below calvinghaf: calve freely
9+ // undercutting has no effect:
10+ meltingrate=0.;
11 }
12 else if(groundedice-calvinghaf>=haf_eps){
13 // ice is well above calvinghaf -> no calving back, i.e. limit calving rate to ice velocity
14 calvingrate=min(calvingrate,vel);
15+ // ice is almost grounded: frontal undercutting has maximum effect (do nothing).
16 }
17 else{ // ice is close to calvinghaf: smooth transition between limitation and free calving.
18- heaviside=(groundedice-calvinghaf+haf_eps)/(2.*haf_eps) + sin(PI*(groundedice-calvinghaf)/haf_eps)/(2.*PI);
19+ //heaviside: 0 for floating, 1 for grounded
20+ heaviside=(groundedice-calvinghaf+haf_eps)/(2.*haf_eps) + sin(PI*(groundedice-calvinghaf)/haf_eps)/(2.*PI);
21 calvingrate=heaviside*(min(calvingrate,vel)-calvingrate)+calvingrate;
22+ meltingrate=heaviside*meltingrate+0.;
23 }
24
25 norm_dlsf=0.;
Note: See TracBrowser for help on using the repository browser.