Changeset 16281

Timestamp:

10/01/13 11:07:15 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: updated pythonb script

Location:

issm/trunk-jpl/src/m/mesh

Files:

• meshconvert.m (modified) (2 diffs)
• meshconvert.py (modified) (2 diffs)

issm/trunk-jpl/src/m/mesh/meshconvert.m

@@ -12 +12 @@
 
 if nargin==1,
-        x=md.mesh.x;
-        y=md.mesh.y;
-        index=md.mesh.elements;
+        index = md.mesh.elements;
+        x     = md.mesh.x;
+        y     = md.mesh.y;
 else
-        index=varargin{1};
-        x=varargin{2};
-        y=varargin{3};
+        index = varargin{1};
+        x     = varargin{2};
+        y     = varargin{3};
 end
 
@@ -25 +25 @@
 
 % plug results onto model
-md.private.bamg=struct();
-md.private.bamg.mesh=bamgmesh(bamgmesh_out);
-md.private.bamg.geometry=bamggeom(bamggeom_out);
-md.mesh.x=bamgmesh_out.Vertices(:,1);
-md.mesh.y=bamgmesh_out.Vertices(:,2);
-md.mesh.elements=bamgmesh_out.Triangles(:,1:3);
-md.mesh.edges=bamgmesh_out.IssmEdges;
-md.mesh.segments=bamgmesh_out.IssmSegments(:,1:3);
-md.mesh.segmentmarkers=bamgmesh_out.IssmSegments(:,4);
+md.private.bamg          = struct();
+md.private.bamg.mesh     = bamgmesh(bamgmesh_out);
+md.private.bamg.geometry = bamggeom(bamggeom_out);
+md.mesh.x              = bamgmesh_out.Vertices(:,1);
+md.mesh.y              = bamgmesh_out.Vertices(:,2);
+md.mesh.elements       = bamgmesh_out.Triangles(:,1:3);
+md.mesh.edges          = bamgmesh_out.IssmEdges;
+md.mesh.segments       = bamgmesh_out.IssmSegments(:,1:3);
+md.mesh.segmentmarkers = bamgmesh_out.IssmSegments(:,4);
 
 %Fill in rest of fields:
-md.mesh.dimension=2;
-md.mesh.numberofelements=size(md.mesh.elements,1);
-md.mesh.numberofvertices=length(md.mesh.x);
-md.mesh.numberofedges=size(md.mesh.edges,1);
-md.mesh.z=zeros(md.mesh.numberofvertices,1);
-md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1);
-md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1);
-md.mesh.elementonbed=ones(md.mesh.numberofelements,1);
-md.mesh.elementonsurface=ones(md.mesh.numberofelements,1);
-md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
+md.mesh.dimension        = 2;
+md.mesh.numberofelements = size(md.mesh.elements,1);
+md.mesh.numberofvertices = length(md.mesh.x);
+md.mesh.numberofedges    = size(md.mesh.edges,1);
+md.mesh.z                = zeros(md.mesh.numberofvertices,1);
+md.mesh.vertexonbed      = ones(md.mesh.numberofvertices,1);
+md.mesh.vertexonsurface  = ones(md.mesh.numberofvertices,1);
+md.mesh.elementonbed     = ones(md.mesh.numberofelements,1);
+md.mesh.elementonsurface = ones(md.mesh.numberofelements,1);
+md.mesh.vertexonboundary = zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2)) = 1;

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

@@ -18 +18 @@
 
         if not len(args):
-                x=md.mesh.x
-                y=md.mesh.y
-                index=md.mesh.elements
+                index = md.mesh.elements
+                x     = md.mesh.x
+                y     = md.mesh.y
         else:
-                x=args[0]
-                y=args[1]
-                index=args[2]
+                index = args[0]
+                x     = args[1]
+                y     = args[2]
 
         #call Bamg
@@ -30 +30 @@
 
         # plug results onto model
-        md.private.bamg=OrderedDict()
-        md.private.bamg['mesh']=bamgmesh(bamgmesh_out)
-        md.private.bamg['geometry']=bamggeom(bamggeom_out)
-        md.mesh.x=bamgmesh_out['Vertices'][:,0].copy()
-        md.mesh.y=bamgmesh_out['Vertices'][:,1].copy()
-        md.mesh.elements=bamgmesh_out['Triangles'][:,0:3].astype(int)
-        md.mesh.edges=bamgmesh_out['IssmEdges'].astype(int)
-        md.mesh.segments=bamgmesh_out['IssmSegments'][:,0:3].astype(int)
-        md.mesh.segmentmarkers=bamgmesh_out['IssmSegments'][:,3].astype(int)
+        md.private.bamg             = OrderedDict()
+        md.private.bamg['mesh']     = bamgmesh(bamgmesh_out)
+        md.private.bamg['geometry'] = bamggeom(bamggeom_out)
+        md.mesh.x                   = bamgmesh_out['Vertices'][:,0].copy()
+        md.mesh.y                   = bamgmesh_out['Vertices'][:,1].copy()
+        md.mesh.elements            = bamgmesh_out['Triangles'][:,0:3].astype(int)
+        md.mesh.edges               = bamgmesh_out['IssmEdges'].astype(int)
+        md.mesh.segments            = bamgmesh_out['IssmSegments'][:,0:3].astype(int)
+        md.mesh.segmentmarkers      = bamgmesh_out['IssmSegments'][:,3].astype(int)
 
         #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.numberofedges=numpy.size(md.mesh.edges,axis=0)
-        md.mesh.z=numpy.zeros(md.mesh.numberofvertices)
-        md.mesh.vertexonbed=numpy.ones(md.mesh.numberofvertices,bool)
-        md.mask.vertexonwater=numpy.zeros(md.mesh.numberofvertices,bool)
-        md.mesh.vertexonsurface=numpy.ones(md.mesh.numberofvertices,bool)
-        md.mesh.elementonbed=numpy.ones(md.mesh.numberofelements,bool)
-        md.mesh.elementonsurface=numpy.ones(md.mesh.numberofelements,bool)
-        md.mesh.vertexonboundary=numpy.zeros(md.mesh.numberofvertices,bool)
-        md.mesh.vertexonboundary[md.mesh.segments[:,0:2]-1]=True
+        md.mesh.dimension          = 2
+        md.mesh.numberofelements   = numpy.size(md.mesh.elements,axis=0)
+        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,bool)
+        md.mask.vertexonwater      = numpy.zeros(md.mesh.numberofvertices,bool)
+        md.mesh.vertexonsurface    = numpy.ones(md.mesh.numberofvertices,bool)
+        md.mesh.elementonbed       = numpy.ones(md.mesh.numberofelements,bool)
+        md.mesh.elementonsurface   = numpy.ones(md.mesh.numberofelements,bool)
+        md.mesh.vertexonboundary   = numpy.zeros(md.mesh.nuberofvertices,bool)
+        md.mesh.vertexonboundary[md.mesh.segments[:,0:2]-1] = True
 
         return md