Changeset 21341 for issm/trunk/src/m/classes/mesh2dvertical.m

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/mesh2dvertical.m (modified) (3 diffs)

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

@@ -93 +93 @@
                         md = checkfield(md,'fieldname','mesh.average_vertex_connectivity','>=',9,'message','''mesh.average_vertex_connectivity'' should be at least 9 in 2d');
 
-                        switch(solution),
-                                case ThermalSolutionEnum(),
-                                        md = checkmessage(md,'thermal not supported for 2d mesh');
+                        if strcmp(solution,'ThermalSolution')
+                                md = checkmessage(md,'thermal not supported for 2d mesh');
                         end
                 end % }}}
@@ -125 +124 @@
                         fielddisplay(self,'epsg','EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)');
                 end % }}}
-                function marshall(self,md,fid) % {{{
-                        WriteData(fid,'enum',DomainTypeEnum(),'data',StringToEnum(['Domain' domaintype(self)]),'format','Integer');
-                        WriteData(fid,'enum',DomainDimensionEnum(),'data',dimension(self),'format','Integer');
-                        WriteData(fid,'enum',MeshElementtypeEnum(),'data',StringToEnum(elementtype(self)),'format','Integer');
-                        WriteData(fid,'object',self,'class','mesh','fieldname','x','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',self,'class','mesh','fieldname','y','format','DoubleMat','mattype',1);
-                        WriteData(fid,'enum',MeshZEnum(),'data',zeros(self.numberofvertices,1),'format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',self,'class','mesh','fieldname','elements','format','DoubleMat','mattype',2);
-                        WriteData(fid,'object',self,'class','mesh','fieldname','numberofelements','format','Integer');
-                        WriteData(fid,'object',self,'class','mesh','fieldname','numberofvertices','format','Integer');
-                        WriteData(fid,'object',self,'class','mesh','fieldname','vertexonbase','format','BooleanMat','mattype',1);
-                        WriteData(fid,'object',self,'class','mesh','fieldname','vertexonsurface','format','BooleanMat','mattype',1);
-                        WriteData(fid,'object',self,'class','mesh','fieldname','average_vertex_connectivity','format','Integer');
+                function marshall(self,prefix,md,fid) % {{{
+                        WriteData(fid,prefix,'name','md.mesh.domain_type','data',['Domain' domaintype(self)],'format','String');
+                        WriteData(fid,prefix,'name','md.mesh.domain_dimension','data',dimension(self),'format','Integer');
+                        WriteData(fid,prefix,'name','md.mesh.elementtype','data',elementtype(self),'format','String');
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','x','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','y','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'name','md.mesh.z','data',zeros(self.numberofvertices,1),'format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','elements','format','DoubleMat','mattype',2);
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','numberofelements','format','Integer');
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','numberofvertices','format','Integer');
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','vertexonbase','format','BooleanMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','vertexonsurface','format','BooleanMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','average_vertex_connectivity','format','Integer');
                 end % }}}
                 function t = domaintype(self) % {{{
@@ -249 +248 @@
                         y        = self.y;
                         z        = zeros(self.numberofvertices,1);
+
+                        if exist(options,'xunit'),
+                                unit=getfieldvalue(options,'xunit');
+                                x=x*unit; % Apply to x only
+                        end
+                        if exist(options,'yunit'),
+                                unit=getfieldvalue(options,'yunit');
+                                x=x*unit; % Apply to x only
+                        end
                 end % }}}
         end