source: issm/oecreview/Archive/13393-13976/ISSM-13495-13496.diff

../trunk-jpl/src/m/mesh/bamg.py

@@ -158 +158 @@
                                                         y4=domain[0]['y'][i2]
 #                                                       x=det([det([x1 y1; x2 y2])  x1-x2;det([x3 y3; x4 y4])  x3-x4])/det([x1-x2 y1-y2;x3-x4 y3-y4]);
 #                                                       y=det([det([x1 y1; x2 y2])  y1-y2;det([x3 y3; x4 y4])  y3-y4])/det([x1-x2 y1-y2;x3-x4 y3-y4]);
-                                                        x=numpy.linalg.det(numpy.array([[numpy.linalg.det(numpy.array([[x1,y1],[x2,y2]])),x1-x2],[numpy.linalg.det(numpy.array([[x3,y3],[x4,y4]])),x3-x4]]))/numpy.linalg.det(numpy.array([[x1-x2,y1-y2],[x3-x4,y3-y4]]));
-                                                        y=numpy.linalg.det(numpy.array([[numpy.linalg.det(numpy.array([[x1,y1],[x2,y2]])),y1-y2],[numpy.linalg.det(numpy.array([[x3,y3],[x4,y4]])),y3-y4]]))/numpy.linalg.det(numpy.array([[x1-x2,y1-y2],[x3-x4,y3-y4]]));
+                                                        x=numpy.linalg.det(numpy.array([[numpy.linalg.det(numpy.array([[x1,y1],[x2,y2]])),x1-x2],[numpy.linalg.det(numpy.array([[x3,y3],[x4,y4]])),x3-x4]]))/numpy.linalg.det(numpy.array([[x1-x2,y1-y2],[x3-x4,y3-y4]]))
+                                                        y=numpy.linalg.det(numpy.array([[numpy.linalg.det(numpy.array([[x1,y1],[x2,y2]])),y1-y2],[numpy.linalg.det(numpy.array([[x3,y3],[x4,y4]])),y3-y4]]))/numpy.linalg.det(numpy.array([[x1-x2,y1-y2],[x3-x4,y3-y4]]))
 
                                                         segdis= sqrt((x4-x3)**2+(y4-y3)**2)
                                                         tipdis=numpy.array([sqrt((x-x3)**2+(y-y3)**2),sqrt((x-x4)**2+(y-y4)**2)])
@@ -204 +204 @@
                                                                 bamg_geometry.Edges=numpy.vstack((bamg_geometry.Edges,\
                                                                         numpy.array([[count,count+1,2]]),\
                                                                         numpy.hstack((numpy.arange(count+1,count+nods).reshape(-1,1),numpy.arange(count+2,count+nods+1).reshape(-1,1),(1+i)*numpy.ones((nods-1,1))))))
-                                                                count=count+nods;
+                                                                count+=nods
 
                                                                 break
 
@@ -326 +326 @@
         #Fill in rest of fields:
         md.mesh.dimension=2
         md.mesh.numberofelements=numpy.size(md.mesh.elements,axis=0)
-        md.mesh.numberofvertices=numpy.size(md.mesh.x);
+        md.mesh.numberofvertices=numpy.size(md.mesh.x)
         md.mesh.numberofedges=numpy.size(md.mesh.edges,axis=0)
         md.mesh.z=numpy.zeros(md.mesh.numberofvertices)
         md.mesh.vertexonbed=numpy.ones(md.mesh.numberofvertices)