Changeset 17806 for issm/trunk/src/m/mesh/bamg.m

Timestamp:

04/22/14 10:39:19 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 17804

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/mesh/bamg.m (modified) (6 diffs)

issm/trunk/src/m/mesh/bamg.m

@@ -284 +284 @@
 %}}}
 % Bamg Mesh parameters {{{
-if (~exist(options,'domain') & md.mesh.numberofvertices~=0 & md.mesh.dimension==2),
+if (~exist(options,'domain') & md.mesh.numberofvertices~=0 & strcmp(elementtype(md.mesh),'Tria')),
 
         if isstruct(md.private.bamg) & isfield(md.private.bamg,'mesh'),
@@ -325 +325 @@
 bamg_options.splitcorners=getfieldvalue(options,'splitcorners',1);
 bamg_options.geometricalmetric=getfieldvalue(options,'geometricalmetric',0);
+bamg_options.random=getfieldvalue(options,'rand',true);
 bamg_options.verbose=getfieldvalue(options,'verbose',1);
 %}}}
@@ -332 +333 @@
 
 if getfieldvalue(options,'vertical',0),
-        md.mesh=mesh2dvertical;
+        md.mesh=mesh2dvertical();
         md.mesh.x=bamgmesh_out.Vertices(:,1);
         md.mesh.y=bamgmesh_out.Vertices(:,2);
@@ -349 +350 @@
         md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
 else
-        % plug results onto model
+        md.mesh=mesh2d();
         md.mesh.x=bamgmesh_out.Vertices(:,1);
         md.mesh.y=bamgmesh_out.Vertices(:,2);
@@ -358 +359 @@
 
         %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;
 end
+
+%Bamg private fields
 md.private.bamg=struct();
 md.private.bamg.mesh=bamgmesh(bamgmesh_out);
@@ -374 +371 @@
 md.mesh.elementconnectivity=md.private.bamg.mesh.ElementConnectivity;
 md.mesh.elementconnectivity(find(isnan(md.mesh.elementconnectivity)))=0;
-
 
 %Check for orphan