Changeset 13439

Timestamp:

09/25/12 14:47:55 (12 years ago)

Author:

jschierm

Message:

FIX: Make thermal.py work for vector, but need to know about multiple columns.

Location:

issm/trunk-jpl/src/m/classes

Files:

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

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

@@ -8 +8 @@
 class matice(object):
         """
-        MATERIALS class definition
+        MATICE class definition
 
            Usage:

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

@@ -71 +71 @@
                 md = checkfield(md,'thermal.spctemperature','forcing',1)
                 if EnthalpyAnalysisEnum() in analyses and (md.thermal.isenthalpy or solution==EnthalpySolutionEnum()) and md.mesh.dimension==3:
-                        pos=numpy.nonzero(numpy.logical_not(numpy.isnan(md.thermal.spctemperature[0: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[0: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")
+                        pos=numpy.nonzero(numpy.logical_not(numpy.isnan(md.thermal.spctemperature[0:md.mesh.numberofvertices])))
+#                       need to know if md.thermal.spctemperature can have multiple columns?
+#                       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[0: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")
+                        replicate=numpy.tile(md.geometry.surface-md.mesh.z,(1))
+                        md = checkfield(md,'thermal.spctemperature[numpy.nonzero(numpy.logical_not(numpy.isnan(md.thermal.spctemperature[0: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])