Changeset 16325

Timestamp:

10/08/13 08:08:56 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: plotting capabilities for mesh2d vertical

Location:

issm/trunk-jpl/src/m

Files:

• classes/mesh2dvertical.m (added)
• plot/applyoptions.m (modified) (2 diffs)
• plot/processdata.m (modified) (2 diffs)
• plot/processmesh.m (modified) (1 diff)

issm/trunk-jpl/src/m/plot/applyoptions.m

@@ -49 +49 @@
 
 %view 
-if md.mesh.dimension==3 & ~exist(options,'layer'),
+if strcmp(meshtype(md.mesh),'3D') & ~exist(options,'layer'),
         view(getfieldvalue(options,'view',3));
 else
@@ -60 +60 @@
         eval(['axis ' getfieldvalue(options,'axis')]);
 else
-        if ((md.mesh.dimension==2) | exist(options,'layer')),
+        if strcmpi(meshtype(md.mesh),'2Dhorizontal') | exist(options,'layer'),
                 axis tight equal;
         else

issm/trunk-jpl/src/m/plot/processdata.m

@@ -15 +15 @@
 if (iscell(data) | isempty(data) | length(data)==0 | (length(data)==1 & ~isstruct(data) & isnan(data))),
         error('plotmodel error message: data provided is empty');
+end
+
+%Process NaN if any (do not know before mask is applied)
+if exist(options,'nan')
+        data(find(isnan(data)))=getfieldvalue(options,'nan',0);
+end
+
+%special case for mesg 2dvertical
+if strcmp(meshtype(md.mesh),'2Dvertical'),
+        [data datatype] = processdata(md.mesh,md,data,options);
+        return;
 end
 
@@ -51 +62 @@
 datasize=size(data);
 
-%Process NaN if any (do not know before mask is applied)
-if exist(options,'nan')
-        data(find(isnan(data)))=getfieldvalue(options,'nan',0);
-end
 %non patch processing
 if datatype~=4 & datatype~=5,

issm/trunk-jpl/src/m/plot/processmesh.m

@@ -13 +13 @@
 if md.mesh.numberofvertices==md.mesh.numberofelements
         error(['plot error message: the number of elements is the same as the number of nodes...']);
+end
+
+%special case for mesg 2dvertical
+if strcmp(meshtype(md.mesh),'2Dvertical'),
+        [x y z elements is2d isplanet] = processmesh(md.mesh,options);
+        return;
 end