Changeset 13401

Timestamp:

09/19/12 10:52:37 (13 years ago)

Author:

seroussi

Message:

CHG: improved check consistency for enthalpy solution

Location:

issm/trunk-jpl/src/m/classes

Files:

• thermal.m (modified) (1 diff)
• thermal.py (modified) (1 diff)

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

@@ -47 +47 @@
                         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),
-                                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');
+                        if (ismember(EnthalpyAnalysisEnum(),analyses) & (md.thermal.isenthalpy | solution==EnthalpySolutionEnum()) & md.mesh.dimension==3),
+                                pos=find(md.thermal.spctemperature(1:md.mesh.numberofvertices,:)~=NaN);
+                                replicate=repmat(md.geometry.surface-md.mesh.z,1,size(md.thermal.spctemperature,2));
+                                md = checkfield(md,'thermal.spctemperature(find(md.thermal.spctemperature(1:md.mesh.numberofvertices,:)~=NaN))','<',md.materials.meltingpoint-md.materials.beta*md.materials.rho_ice*md.constants.g*replicate(pos),'message','spctemperature should be below the adjusted melting point');
                                 md = checkfield(md,'thermal.isenthalpy','numel',[1],'values',[0 1]);
                         end

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

@@ -69 +69 @@
                 md = checkfield(md,'thermal.stabilization','numel',[1],'values',[0,1,2])
                 md = checkfield(md,'thermal.spctemperature','forcing',1)
-                if EnthalpyAnalysisEnum() in analyses and md.thermal.isenthalpy and md.mesh.dimension==3:
+                if EnthalpyAnalysisEnum() in analyses and (md.thermal.isenthalpy or solution==EnthalpySolutionEnum()) and md.mesh.dimension==3:
                         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])