Changeset 11265

Timestamp:

01/31/12 10:31:36 (13 years ago)

Author:

seroussi

Message:

minor changes in thermal class for enthalpy

File:

• issm/trunk-jpl/src/m/classes/thermal.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/thermal.m

@@ -46 +46 @@
 
                         %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) % {{{