Changeset 12663 for issm/trunk-jpl/src/m/classes/thermal.m

Timestamp:

07/19/12 15:32:17 (13 years ago)

Author:

Mathieu Morlighem

Message:

ismodelselfconsistant now uses a model field instead of a persistent variable

File:

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

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

@@ -40 +40 @@
                         obj.isenthalpy=0;
                 end % }}}
-                function checkconsistency(obj,md,solution,analyses) % {{{
+                function md = checkconsistency(obj,md,solution,analyses) % {{{
 
                         %Early return
                         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);
+                        md = checkfield(md,'thermal.stabilization','numel',1,'values',[0 1 2]);
+                        md = checkfield(md,'thermal.spctemperature','forcing',1);
                         if (ismember(EnthalpyAnalysisEnum,analyses) & md.thermal.isenthalpy & md.mesh.dimension==3),
-                        checkfield(md,'thermal.spctemperature','<',md.materials.meltingpoint-md.materials.beta*md.materials.rho_ice*md.constants.g*(md.geometry.surface-md.mesh.z),'message','spctemperature should be below the adjusted melting point');
-                        checkfield(md,'thermal.isenthalpy','numel',1,'values',[0 1]);
+                        md = checkfield(md,'thermal.spctemperature','<',md.materials.meltingpoint-md.materials.beta*md.materials.rho_ice*md.constants.g*(md.geometry.surface-md.mesh.z),'message','spctemperature should be below the adjusted melting point');
+                        md = checkfield(md,'thermal.isenthalpy','numel',1,'values',[0 1]);
                         end
                 end % }}}