Changeset 12979

Timestamp:

08/10/12 14:07:46 (13 years ago)

Author:

Eric.Larour

Message:

CHG: adapted plotting routines to @planet class, where the
@model.mesh object is a @planetmesh, which does not have all the fields
that a more classic @mesh class object.

Location:

issm/trunk-jpl/src/m/model/plot

Files:

• applyoptions.m (modified) (1 diff)
• processdata.m (modified) (4 diffs)
• processmesh.m (modified) (2 diffs)

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

@@ -9 +9 @@
 
 %some defaults
-if strcmpi(md.mesh.hemisphere,'n'), options=addfielddefault(options,'hemisphere','n'); 
-elseif strcmpi(md.mesh.hemisphere,'s'), options=addfielddefault(options,'hemisphere','s'); 
+if isfield(md.mesh,'hemisphere'),
+        if strcmpi(md.mesh.hemisphere,'n'), options=addfielddefault(options,'hemisphere','n'); 
+        elseif strcmpi(md.mesh.hemisphere,'s'), options=addfielddefault(options,'hemisphere','s'); 
+        end
 end
 

issm/trunk-jpl/src/m/model/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
+
+%needed later on
+if isfield(md.mesh,'numberofvertices2d'), 
+        numberofvertices2d=md.mesh.numberofvertices2d; 
+        numberofelements2d=md.mesh.numberofelements2d; 
+else 
+        numberofvertices2d=NaN;
+        numberofelements2d=NaN;
 end
 
@@ -62 +71 @@
 
         %check length
-        if datasize(1)~=md.mesh.numberofvertices & datasize(1)~=md.mesh.numberofelements & datasize(1)~=md.mesh.numberofvertices*6 & (md.mesh.dimension==3 & ~(datasize(1)==md.mesh.numberofelements2d | datasize(1)==md.mesh.numberofvertices2d))
+        
+        if datasize(1)~=md.mesh.numberofvertices & datasize(1)~=md.mesh.numberofelements & datasize(1)~=md.mesh.numberofvertices*6 & (md.mesh.dimension==3 & ~(datasize(1)==numberofelements2d | datasize(1)==numberofvertices2d))
                 error('plotmodel error message: data not supported yet');
         end
-
+        
         %quiver?
         if datasize(2)>1,
@@ -93 +103 @@
 
         %treat the case datasize(1)=nodes2d
-        if (md.mesh.dimension==3 & datasize(1)==md.mesh.numberofvertices2d),
+        if (md.mesh.dimension==3 & datasize(1)==numberofvertices2d),
                 data=project3d(md,'vector',data,'type','node');
                 datasize(1)=md.mesh.numberofvertices;
@@ -100 +110 @@
 
         %treat the case datasize(1)=nodes2d
-        if (md.mesh.dimension==3 & datasize(1)==md.mesh.numberofelements2d),
+        if (md.mesh.dimension==3 & datasize(1)==numberofelements2d),
                 data=project3d(md,'vector',data,'type','element');
                 datasize(1)=md.mesh.numberofelements;

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

@@ -20 +20 @@
         if ~strcmpi(getfieldvalue(options,'coord','xy'),'latlon'),
                 x=md.mesh.x;
-                x2d=md.mesh.x2d;
+                if isfield(md.mesh,'x2d'), x2d=md.mesh.x2d; end
                 y=md.mesh.y;
-                y2d=md.mesh.y2d;
+                if isfield(md.mesh,'y2d'), y2d=md.mesh.y2d; end
         else
                 x=md.mesh.long;
-                x2d=md.mesh.x2d;
+                %x2d=md.mesh.x2d; this sounds like something that was forgotten
                 y=md.mesh.lat;
-                y2d=md.mesh.y2d;
+                %y2d=md.mesh.y2d;
         end
 
@@ -40 +40 @@
 
 
-        elements2d=md.mesh.elements2d;
+        if isfield(md.mesh,'elements2d'), elements2d=md.mesh.elements2d; end
         elements=md.mesh.elements;