Changeset 13503

Timestamp:

10/02/12 14:44:46 (12 years ago)

Author:

jschierm

Message:

FIX: Fixes required for test205.py.

Location:

issm/trunk-jpl/src/m

Files:

• geometry/FlagElements.py (modified) (1 diff)
• geometry/SegIntersect.py (modified) (2 diffs)
• parameterization/setflowequation.py (modified) (2 diffs)

issm/trunk-jpl/src/m/geometry/FlagElements.py

@@ -47 +47 @@
                         else:
                                 #ok, flag elements
-                                [flag,dum]=ContourToMesh(md.mesh.elements[:,0:3],md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),region,'element',1)
+                                [flag,dum]=ContourToMesh(md.mesh.elements[:,0:3].copy(),md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),region,'element',1)
 
                 if invert:

issm/trunk-jpl/src/m/geometry/SegIntersect.py

@@ -1 +1 @@
 import numpy
-from MatlabFuncs import *
 
 def SegIntersect(seg1,seg2):
@@ -48 +47 @@
 
         #if colinear
-        if test1*test2==0 and test3*test4==0 and det(numpy.hstack((n1.reshape((-1,1)),n2.reshape(-1,1))))==0:
+        if test1*test2==0 and test3*test4==0 and numpy.linalg.det(numpy.hstack((n1.reshape((-1,1)),n2.reshape(-1,1))))==0:
 
                 #projection on the axis O1O2

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

@@ -123 +123 @@
                 numnodes2d=md.mesh.numberofvertices2d
                 numlayers=md.mesh.numberoflayers
-                bordernodes2d=numpy.nonzero(numpy.logical_and(nodeonpattyn[1:numnodes2d],nodeonmacayeal[1:numnodes2d]))    #Nodes connected to two different types of elements
+                bordernodes2d=numpy.nonzero(numpy.logical_and(nodeonpattyn[0:numnodes2d],nodeonmacayeal[0:numnodes2d]))[0]+1    #Nodes connected to two different types of elements
 
                 #initialize and fill in penalties structure
@@ -129 +129 @@
                         penalties=numpy.zeros((0,2))
                         for     i in xrange(1,numlayers):
-                                penalties=numpy.vstack((penalties,numpy.hstack((bordernodes2d,bordernodes2d+md.mesh.numberofvertices2d*(i)))))
+                                penalties=numpy.vstack((penalties,numpy.hstack((bordernodes2d.reshape(-1,1),bordernodes2d.reshape(-1,1)+md.mesh.numberofvertices2d*(i)))))
                         md.diagnostic.vertex_pairing=penalties