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
RevLine 
[16556]1Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16308)
4+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16309)
5@@ -2564,9 +2564,9 @@
6 surface_input->GetInputAverage(&surface);
7 bed_input->GetInputAverage(&bed);
8 bathymetry_input->GetInputAverage(&bathymetry);
9-
10+
11 /*Return: */
12- return base*(surface-bed+rho_water/rho_ice*bathymetry);
13+ return base*(surface-bed+min(rho_water/rho_ice*bathymetry,0.));
14 }
15 /*}}}*/
16 /*FUNCTION Tria::MassFlux {{{*/
17Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
18===================================================================
19--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16308)
20+++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16309)
21@@ -3711,7 +3711,7 @@
22 bathymetry_input->GetInputAverage(&bathymetry);
23
24 /*Return: */
25- return base*(surface - bed + rho_water/rho_ice * bathymetry);
26+ return base*(surface - bed + min( rho_water/rho_ice * bathymetry, 0.) );
27 }
28 /*}}}*/
29 /*FUNCTION Penta::MinVel{{{*/
Note: See TracBrowser for help on using the repository browser.