source: issm/oecreview/Archive/11250-11268/ISSM-11264-11265.diff@ 11514

Last change on this file since 11514 was 11514, checked in by Eric.Larour, 13 years ago

11229 to 11268 oecreview

File size: 1.2 KB
RevLine 
[11514]1Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m
2===================================================================
3--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m (revision 11264)
4+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m (revision 11265)
5@@ -45,10 +45,13 @@
6 function checkconsistency(obj,md,solution,analyses) % {{{
7
8 %Early return
9- if ~ismember(ThermalAnalysisEnum,analyses) | (solution==TransientSolutionEnum & md.transient.isthermal==0), return; end
10+ if (~ismember(ThermalAnalysisEnum,analyses) & ~ismember(EnthalpyAnalysisEnum,analyses)) | (solution==TransientSolutionEnum & md.transient.isthermal==0), return; end
11
12 checkfield(md,'thermal.stabilization','numel',1,'values',[0 1 2]);
13 checkfield(md,'thermal.spctemperature','forcing',1);
14+ if ismember(EnthalpyAnalysisEnum,analyses),
15+ checkfield(md,'thermal.spctemperature','<',md.materials.meltingpoint-md.materials.beta*md.materials.rho_ice*md.constants.g*md.geometry.thickness,'message','spctemperature should be below the adjusted melting point');
16+ end
17 end % }}}
18 function disp(obj) % {{{
19 disp(sprintf(' Thermal solution parameters:'));
Note: See TracBrowser for help on using the repository browser.