Changeset 9725 for issm/trunk/src/m/model/bamg.m

Timestamp:

09/09/11 08:35:15 (14 years ago)

Author:

Mathieu Morlighem

Message:

Some more objects in mesh

File:

• issm/trunk/src/m/model/bamg.m (modified) (2 diffs)

issm/trunk/src/m/model/bamg.m

@@ -265 +265 @@
 
 % Bamg Mesh parameters {{{1
-if (~exist(options,'domain') & md.numberofnodes~=0 & md.mesh.dimension==2),
+if (~exist(options,'domain') & md.mesh.numberofvertices~=0 & md.mesh.dimension==2),
 
         if isstruct(md.private.bamg),
                 bamg_mesh=bamgmesh(md.private.bamg.mesh);
         else
-                bamg_mesh.Vertices=[md.x md.y ones(md.numberofnodes,1)];
-                bamg_mesh.Triangles=[md.elements ones(md.numberofelements,1)];
+                bamg_mesh.Vertices=[md.x md.y ones(md.mesh.numberofvertices,1)];
+                bamg_mesh.Triangles=[md.elements ones(md.mesh.numberofelements,1)];
         end
 
@@ -326 +326 @@
 %Fill in rest of fields:
 md.mesh.dimension=2;
-md.numberofelements=size(md.elements,1);
-md.numberofnodes=length(md.x);
-md.z=zeros(md.numberofnodes,1);
-md.nodeonbed=ones(md.numberofnodes,1);
-md.mask.vertexonwater=zeros(md.numberofnodes,1);
-md.nodeonsurface=ones(md.numberofnodes,1);
-md.elementonbed=ones(md.numberofelements,1);
-md.elementonsurface=ones(md.numberofelements,1);
-md.mesh.vertexonboundary=zeros(md.numberofnodes,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
+md.mesh.numberofelements=size(md.elements,1);
+md.mesh.numberofvertices=length(md.x);
+md.z=zeros(md.mesh.numberofvertices,1);
+md.nodeonbed=ones(md.mesh.numberofvertices,1);
+md.mask.vertexonwater=zeros(md.mesh.numberofvertices,1);
+md.nodeonsurface=ones(md.mesh.numberofvertices,1);
+md.elementonbed=ones(md.mesh.numberofelements,1);
+md.elementonsurface=ones(md.mesh.numberofelements,1);
+md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
 md.elementconnectivity=md.private.bamg.mesh.ElementConnectivity;
 md.elementconnectivity(find(isnan(md.elementconnectivity)))=0;
 
 %Check for orphan
-if any(~ismember(1:md.numberofnodes,sort(unique(md.elements(:)))))
+if any(~ismember(1:md.mesh.numberofvertices,sort(unique(md.elements(:)))))
         error('Output mesh has orphans. Decrease MaxCornerAngle to prevent outside points (ex: 0.01)');
 end