source: issm/oecreview/Archive/18296-19100/ISSM-18516-18517.diff

Last change on this file was 19102, checked in by Mathieu Morlighem, 10 years ago

NEW: added 18296-19100

File size: 1.3 KB
RevLine 
[19102]1Index: ../trunk-jpl/test/Archives/Archive432.nc
2===================================================================
3Cannot display: file marked as a binary type.
4svn:mime-type = application/octet-stream
5Index: ../trunk-jpl/test/Archives/Archive325.nc
6===================================================================
7Cannot display: file marked as a binary type.
8svn:mime-type = application/octet-stream
9Index: ../trunk-jpl/test/Archives/Archive431.nc
10===================================================================
11Cannot display: file marked as a binary type.
12svn:mime-type = application/octet-stream
13Index: ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp
14===================================================================
15--- ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 18516)
16+++ ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 18517)
17@@ -587,7 +587,7 @@
18 pressure_input->GetInputValue(&pressure,gauss);
19 watercolumn_input->GetInputValue(&watercolumn,gauss);
20
21- if((watercolumn<=0.) && (enthalpy<PureIceEnthalpy(element,pressure))){
22+ if((dt==0.) || ((watercolumn<=0.) && (enthalpy<PureIceEnthalpy(element,pressure)))){
23 /* the above check is equivalent to
24 NOT [(watercolumn>0.) AND (enthalpy<PIE)] AND (enthalpy<PIE)*/
25 geothermalflux_input->GetInputValue(&geothermalflux,gauss);
Note: See TracBrowser for help on using the repository browser.