source: issm/oecreview/Archive/26740-27031/ISSM-27022-27023.diff@ 27032

Last change on this file since 27032 was 27032, checked in by Mathieu Morlighem, 3 years ago

CHG: added 26740-27031
File size: 757 bytes
RevLine 
[27032]1Index: ../trunk-jpl/src/c/cores/bmb_core.cpp
2===================================================================
3--- ../trunk-jpl/src/c/cores/bmb_core.cpp (revision 27022)
4+++ ../trunk-jpl/src/c/cores/bmb_core.cpp (revision 27023)
5@@ -35,7 +35,9 @@
6 /*Call module now*/
7 FloatingiceMeltingRatex(femmodel);
8
9- /*Extrude basal melt*/
10- femmodel->parameters->SetParam(BasalforcingsFloatingiceMeltingRateEnum,InputToExtrudeEnum);
11- extrudefrombase_core(femmodel);
12+ /*Extrude basal melt if not default melting rate (which may be a transient input that can't be extruded)*/
13+ if(basalforcing_model!=FloatingMeltRateEnum){
14+ femmodel->parameters->SetParam(BasalforcingsFloatingiceMeltingRateEnum,InputToExtrudeEnum);
15+ extrudefrombase_core(femmodel);
16+ }
17 }
Note: See TracBrowser for help on using the repository browser.