[19102] | 1 | Index: ../trunk-jpl/test/Archives/Archive432.nc
|
---|
| 2 | ===================================================================
|
---|
| 3 | Cannot display: file marked as a binary type.
|
---|
| 4 | svn:mime-type = application/octet-stream
|
---|
| 5 | Index: ../trunk-jpl/test/Archives/Archive325.nc
|
---|
| 6 | ===================================================================
|
---|
| 7 | Cannot display: file marked as a binary type.
|
---|
| 8 | svn:mime-type = application/octet-stream
|
---|
| 9 | Index: ../trunk-jpl/test/Archives/Archive431.nc
|
---|
| 10 | ===================================================================
|
---|
| 11 | Cannot display: file marked as a binary type.
|
---|
| 12 | svn:mime-type = application/octet-stream
|
---|
| 13 | Index: ../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);
|
---|