Changeset 14015

Timestamp:

11/27/12 11:34:55 (12 years ago)

Author:

jschierm

Message:

CHG: Changed vertex_equation and element_equation to int for python.

Location:

issm/trunk-jpl/src/m

Files:

• classes/model/model.py (modified) (2 diffs)
• mesh/rifts/meshprocessoutsiderifts.py (modified) (1 diff)
• parameterization/setflowequation.py (modified) (2 diffs)

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

@@ -618 +618 @@
                 if not numpy.any(numpy.isnan(md.flowequation.element_equation)):
                         oldelements_type=md.flowequation.element_equation
-                        md.flowequation.element_equation=numpy.zeros(number_el3d)
+                        md.flowequation.element_equation=numpy.zeros(number_el3d,int)
                         md.flowequation.element_equation=project3d(md,'vector',oldelements_type,'type','element')
 
@@ -624 +624 @@
                 if not numpy.any(numpy.isnan(md.flowequation.vertex_equation)):
                         oldvertices_type=md.flowequation.vertex_equation
-                        md.flowequation.vertex_equation=numpy.zeros(number_nodes3d)
+                        md.flowequation.vertex_equation=numpy.zeros(number_nodes3d,int)
                         md.flowequation.vertex_equation=project3d(md,'vector',oldvertices_type,'type','node')
 

issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.py

@@ -84 +84 @@
         md.mesh.vertexonboundary[md.mesh.segments[:,0:2]-1]=True
         md.rifts.numrifts=length(md.rifts.riftstruct)
-        md.flowequation.element_equation=3.*numpy.ones(md.mesh.numberofelements)
+        md.flowequation.element_equation=3*numpy.ones(md.mesh.numberofelements,int)
         md.mesh.vertexonbed=numpy.ones(md.mesh.numberofvertices,bool)
         md.mesh.vertexonsurface=numpy.ones(md.mesh.numberofvertices,bool)

issm/trunk-jpl/src/m/parameterization/setflowequation.py

@@ -233 +233 @@
 
         #Create MacaAyealPattynApproximation where needed
-        md.flowequation.element_equation=numpy.zeros(md.mesh.numberofelements)
+        md.flowequation.element_equation=numpy.zeros(md.mesh.numberofelements,int)
         md.flowequation.element_equation[numpy.nonzero(noneflag)]=0
         md.flowequation.element_equation[numpy.nonzero(hutterflag)]=1
@@ -250 +250 @@
 
         #Create vertices_type
-        md.flowequation.vertex_equation=numpy.zeros(md.mesh.numberofvertices)
+        md.flowequation.vertex_equation=numpy.zeros(md.mesh.numberofvertices,int)
         pos=numpy.nonzero(nodeonmacayeal)
         md.flowequation.vertex_equation[pos]=2