Changeset 16335

Timestamp:

10/08/13 11:00:18 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: improving mesh2dvertical capabilities

Location:

issm/trunk-jpl/src/m

Files:

• classes/geometry.m (modified) (2 diffs)
• classes/mesh2dvertical.m (modified) (7 diffs)
• mesh/bamg.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/geometry.m

@@ -26 +26 @@
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
 
-                        if strcmp(meshtype(md.mesh),'2Dvertical'),
-                                return;
-                        end
-
                         if (solution==TransientSolutionEnum() & md.transient.isgia) | (solution==GiaSolutionEnum()),
                                 md = checkfield(md,'geometry.thickness','forcing',1,'NaN',1,'>=',0);
@@ -55 +51 @@
                 end % }}}
                 function marshall(obj,md,fid) % {{{
-                        if strcmp(meshtype(md.mesh),'2Dvertical'),
-                                return;
-                        end
                         WriteData(fid,'data',obj.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum());
                         WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1);

issm/trunk-jpl/src/m/classes/mesh2dvertical.m

@@ -18 +18 @@
 
                 vertexonboundary            = NaN
+                vertexonbed                 = NaN
 
                 edges                       = NaN
@@ -25 +26 @@
                 elementconnectivity         = NaN
                 average_vertex_connectivity = 0;
-
-                extractedvertices           = NaN
-                extractedelements           = NaN
         end
         methods
@@ -58 +56 @@
                         md = checkfield(md,'mesh.numberofelements','>',0);
                         md = checkfield(md,'mesh.numberofvertices','>',0);
+                        md = checkfield(md,'mesh.vertexonbed','size',[md.mesh.numberofvertices 1],'values',[0 1]);
                         md = checkfield(md,'mesh.average_vertex_connectivity','>=',9,'message','''mesh.average_vertex_connectivity'' should be at least 9 in 2d');
 
@@ -66 +65 @@
                 end % }}}
                 function disp(obj) % {{{
-                        disp(sprintf('   2d Mesh:')); 
+                        disp(sprintf('   2d vertical Mesh:')); 
 
                         disp(sprintf('\n      Elements and vertices:'));
@@ -79 +78 @@
                         disp(sprintf('\n      Properties:'));
                         fielddisplay(obj,'vertexonboundary','vertices on the boundary of the domain flag list');
+                        fielddisplay(obj,'vertexonbed','vertices on the bed of the domain flag list');
                         fielddisplay(obj,'segments','edges on domain boundary (vertex1 vertex2 element)');
                         fielddisplay(obj,'segmentmarkers','number associated to each segment');
@@ -102 +102 @@
                         WriteData(fid,'object',obj,'class','mesh','fieldname','numberofelements','format','Integer');
                         WriteData(fid,'object',obj,'class','mesh','fieldname','numberofvertices','format','Integer');
+                        WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonbed','format','BooleanMat','mattype',1);
                         WriteData(fid,'object',obj,'class','mesh','fieldname','average_vertex_connectivity','format','Integer');
                 end % }}}
                 function t = meshtype(obj) % {{{
                         t = '2Dvertical';
+                end % }}}
+                function flags = vertexflags(self,value) % {{{
+                        flags = zeros(self.numberofvertices,1);
+                        pos   = self.segments(find(self.segmentmarkers==value),1:2);
+                        flags(pos) = 1;
                 end % }}}
                 function [data datatype] = processdata(self,md,data,options) % {{{
@@ -129 +135 @@
                         if datasize(2)>1,
                                 datatype=3;
-
-                                %check number of columns, add zeros if necessary,
-                                if (md.mesh.dimension==3)
-                                        if datasize(2)==2,
-                                                data=[data, zeros(datasize(1),1)];
-                                        elseif datasize(2)~=3,
-                                                error('plotmodel error message: data provided should have 2 or 3 columns for quiver plot, and 1 for regular plot');
-                                        end
-                                        %elseif ((md.mesh.dimension==2) & datasize(2)~=2),
-                                        %       error('plotmodel error message: data provided should have 2 columns for quiver plot, and 1 for regular plot');
-                                end
                         end
 

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

@@ -102 +102 @@
                 count=count+nods;
         end
+        if getfieldvalue(options,'vertical',0),
+                if numel(getfieldvalue(options,'Markers',[]))~=size(bamg_geometry.Edges,1),
+                        error(['for 2d vertical mesh, ''Markers'' option is required, and should be of size ' num2str(size(bamg_geometry.Edges,1))]);
+                end
+        end
         if numel(getfieldvalue(options,'Markers',[]))==size(bamg_geometry.Edges,1),
                 bamg_geometry.Edges(:,3)=getfieldvalue(options,'Markers');