Changeset 13951

Timestamp:

11/13/12 11:46:27 (12 years ago)

Author:

jschierm

Message:

CHG: Go faster\!

Location:

issm/trunk-jpl/src/m/classes

Files:

• flowequation.py (modified) (1 diff)
• mesh.py (modified) (1 diff)

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

@@ -68 +68 @@
                                 md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',[1,2])
                         else:
-                                md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',range(0,7+1))
-                                md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',range(0,7+1))
+                                md = checkfield(md,'flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',numpy.arange(0,7+1))
+                                md = checkfield(md,'flowequation.element_equation','size',[md.mesh.numberofelements],'values',numpy.arange(0,7+1))
                         if not (self.ismacayealpattyn or self.ishutter or self.isstokes or self.isl1l2):
                                 md.checkmessage("no element types set for this model. At least one of ismacayealpattyn, ishutter or isstokes need to be =1")

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

@@ -132 +132 @@
                 md = checkfield(md,'mesh.y','NaN',1,'size',[md.mesh.numberofvertices])
                 md = checkfield(md,'mesh.z','NaN',1,'size',[md.mesh.numberofvertices])
-                md = checkfield(md,'mesh.elements','NaN',1,'>',0,'values',range(1,md.mesh.numberofvertices+1))
+                md = checkfield(md,'mesh.elements','NaN',1,'>',0,'values',numpy.arange(1,md.mesh.numberofvertices+1))
                 if md.mesh.dimension==2:
                         md = checkfield(md,'mesh.elements','size',[md.mesh.numberofelements,3])
                 else:
                         md = checkfield(md,'mesh.elements','size',[md.mesh.numberofelements,6])
-                if numpy.any(numpy.logical_not(ismember(range(1,md.mesh.numberofvertices+1),md.mesh.elements))):
+                if numpy.any(numpy.logical_not(ismember(numpy.arange(1,md.mesh.numberofvertices+1),md.mesh.elements))):
                         md.checkmessage("orphan nodes have been found. Check the mesh outline")
                 md = checkfield(md,'mesh.dimension','values',[2,3])