Changeset 13420

Timestamp:

09/24/12 11:21:44 (12 years ago)

Author:

jschierm

Message:

CHG: Modified thermal.py corresponding to changeset [13401].

File:

• issm/trunk-jpl/src/m/classes/thermal.py (modified) (2 diffs)

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

@@ -1 +1 @@
 #module imports
+import numpy
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
@@ -70 +71 @@
                 md = checkfield(md,'thermal.spctemperature','forcing',1)
                 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")
+                        pos=numpy.nonzero(numpy.logical_not(numpy.isnan(md.thermal.spctemperature[1:md.mesh.numberofvertices,:])))
+                        replicate=numpy.tile(md.geometry.surface-md.mesh.z,(1,numpy.size(md.thermal.spctemperature,axis=1)))
+                        md = checkfield(md,'thermal.spctemperature(numpy.nonzero(numpy.logical_not(numpy.isnan(md.thermal.spctemperature[1:md.mesh.numberofvertices,:]))))','<',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])