source: issm/oecreview/Archive/16133-16554/ISSM-16308-16309.diff

Last change on this file was 16556, checked in by Mathieu Morlighem, 11 years ago

NEW: added Archive/16133-16554

File size: 1.1 KB
  • ../trunk-jpl/src/c/classes/Elements/Tria.cpp

     
    25642564        surface_input->GetInputAverage(&surface);
    25652565        bed_input->GetInputAverage(&bed);
    25662566        bathymetry_input->GetInputAverage(&bathymetry);
    2567 
     2567       
    25682568        /*Return: */
    2569         return base*(surface-bed+rho_water/rho_ice*bathymetry);
     2569        return base*(surface-bed+min(rho_water/rho_ice*bathymetry,0.));
    25702570}
    25712571/*}}}*/
    25722572/*FUNCTION Tria::MassFlux {{{*/
  • ../trunk-jpl/src/c/classes/Elements/Penta.cpp

     
    37113711        bathymetry_input->GetInputAverage(&bathymetry);
    37123712
    37133713        /*Return: */
    3714         return base*(surface - bed + rho_water/rho_ice * bathymetry);
     3714        return base*(surface - bed + min( rho_water/rho_ice * bathymetry, 0.) );
    37153715}
    37163716/*}}}*/
    37173717/*FUNCTION Penta::MinVel{{{*/
Note: See TracBrowser for help on using the repository browser.