Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m =================================================================== --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m (revision 11264) +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m (revision 11265) @@ -45,10 +45,13 @@ function checkconsistency(obj,md,solution,analyses) % {{{ %Early return - if ~ismember(ThermalAnalysisEnum,analyses) | (solution==TransientSolutionEnum & md.transient.isthermal==0), return; end + if (~ismember(ThermalAnalysisEnum,analyses) & ~ismember(EnthalpyAnalysisEnum,analyses)) | (solution==TransientSolutionEnum & md.transient.isthermal==0), return; end checkfield(md,'thermal.stabilization','numel',1,'values',[0 1 2]); checkfield(md,'thermal.spctemperature','forcing',1); + if ismember(EnthalpyAnalysisEnum,analyses), + 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'); + end end % }}} function disp(obj) % {{{ disp(sprintf(' Thermal solution parameters:'));