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

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

CHG: added 21724-22754

File size: 1.2 KB
  • TabularUnified ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp

     
    422422                                haf_eps=10.;
    423423                                if(groundedice-calvinghaf<=-haf_eps){
    424424                                        // ice floats freely below calvinghaf: calve freely
     425                                        // undercutting has no effect:
     426                                        meltingrate=0.;
    425427                                }
    426428                                else if(groundedice-calvinghaf>=haf_eps){
    427429                                        // ice is well above calvinghaf -> no calving back, i.e. limit calving rate to ice velocity
    428430                                        calvingrate=min(calvingrate,vel);
     431                                        // ice is almost grounded: frontal undercutting has maximum effect (do nothing).
    429432                                }
    430433                                else{ // ice is close to calvinghaf: smooth transition between limitation and free calving.
    431                                         heaviside=(groundedice-calvinghaf+haf_eps)/(2.*haf_eps) + sin(PI*(groundedice-calvinghaf)/haf_eps)/(2.*PI);
     434                                        //heaviside: 0 for floating, 1 for grounded
     435                                        heaviside=(groundedice-calvinghaf+haf_eps)/(2.*haf_eps) + sin(PI*(groundedice-calvinghaf)/haf_eps)/(2.*PI);
    432436                                        calvingrate=heaviside*(min(calvingrate,vel)-calvingrate)+calvingrate;
     437                                        meltingrate=heaviside*meltingrate+0.;
    433438                                }
    434439
    435440                                norm_dlsf=0.;
Note: See TracBrowser for help on using the repository browser.