Changeset 17674 for issm/trunk-jpl/src/m/plot

Timestamp:

04/08/14 14:59:42 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renamed meshtype->meshxdim (Extended Dimension) and added meshdim (2 or 3) and meshtype (Tria Penta Tetra)

Location:

issm/trunk-jpl/src/m/plot

Files:

• applyoptions.m (modified) (2 diffs)
• plot_basaldrag.m (modified) (1 diff)
• plot_edges.m (modified) (1 diff)
• plot_icefront.m (modified) (1 diff)
• plot_penalties.m (modified) (1 diff)
• plot_qmu_mass_flux_segments.m (modified) (1 diff)
• plot_referential.m (modified) (1 diff)
• plot_section.m (modified) (1 diff)
• plot_segments.m (modified) (1 diff)
• plot_tensor_components.m (modified) (3 diffs)
• plot_tensor_principal.m (modified) (4 diffs)
• plot_tensor_principalaxis.m (modified) (2 diffs)
• plot_transient_results.m (modified) (2 diffs)
• processdata.m (modified) (5 diffs)
• processmesh.m (modified) (2 diffs)
• processmesh.py (modified) (2 diffs)

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

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

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

@@ -9 +9 @@
 
 %check layer
-if strcmp(meshtype(md.mesh),'3D'),
+if meshdim(md.mesh)==3,
         if getfieldvalue(options,'layer',1)~=1;
                 disp('plot_basaldrag warning: basal drag is displayed in the lower layer')

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

@@ -17 +17 @@
 end
 
-if (strcmp(meshtype(md.mesh),'2Dhorizontal')),
+if (strcmp(meshxdim(md.mesh),'2Dhorizontal')),
         %plot mesh
         A=elements(:,1); B=elements(:,2); C=elements(:,3); 

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

@@ -19 +19 @@
 elementzeroice=sum(zeroice(md.mesh.elements),2);
 
-if (strcmp(meshtype(md.mesh),'2Dhorizontal')),
+if (strcmp(meshxdim(md.mesh),'2Dhorizontal')),
         icefront=(elementice & elementnoice) & ~(elementice==2 & elementzeroice);
 

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

@@ -21 +21 @@
 end
 
-if ~strcmp(meshtype(md.mesh),'3D'),
+if ~strcmp(meshxdim(md.mesh),'3D'),
         error('no penalties to plot for ''2d'' model');
 elseif isempty(md.penalties),

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

@@ -13 +13 @@
 allsegments=md.qmu.mass_flux_segments;
 
-if (strcmp(meshtype(md.mesh),'2Dhorizontal')),
+if (strcmp(meshxdim(md.mesh),'2Dhorizontal')),
 
         %recover segments

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

@@ -28 +28 @@
 Yhat=cross(Zhat,Xhat);
 
-if (strcmp(meshtype(md.mesh),'2Dhorizontal')),
+if (strcmp(meshxdim(md.mesh),'2Dhorizontal')),
 
         %plot mesh

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

@@ -203 +203 @@
 %apply options
 options=addfielddefault(options,'title','Section value');
-if (strcmp(meshtype(md.mesh),'2Dhorizontal'))
+if meshdim(md.mesh)==2
         options=addfielddefault(options,'colorbar',0);
 end
-if ((strcmp(meshtype(md.mesh),'2Dhorizontal')) | getfieldvalue(options,'view')==2 )
+if ((meshdim(md.mesh)==2) | getfieldvalue(options,'view')==2 )
         options=addfielddefault(options,'xlabel','Curvilinear coordinate');
         options=addfielddefault(options,'axis','auto');
 end
-if (strcmp(meshtype(md.mesh),'3D') & getfieldvalue(options,'view')==2 )
+if (meshdim(md.mesh)==3 & getfieldvalue(options,'view')==2 )
         options=addfielddefault(options,'ylabel','z');
 end

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

@@ -14 +14 @@
 segments=md.mesh.segments;
 
-if (strcmp(meshtype(md.mesh),'2Dhorizontal')),
+if (strcmp(meshxdim(md.mesh),'2Dhorizontal')),
         %plot mesh
         A=elements(:,1); B=elements(:,2); C=elements(:,3); 

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

@@ -10 +10 @@
 upperplots=fix((i-1)/width);
 if upperplots==0, leftplots=i-1; else leftplots=i-width*upperplots-1; end
-if (strcmp(meshtype(md.mesh),'2Dhorizontal'))%3 components -> 3 indexes
+if (strcmp(meshxdim(md.mesh),'2Dhorizontal'))%3 components -> 3 indexes
         index1=4*width*upperplots+2*leftplots+1;
         index2=index1+1;
         index3=index1+width*2;
-elseif strcmp(meshtype(md.mesh),'3D')%6 components -> 6 indexes
+elseif meshdim(md.mesh)==3%6 components -> 6 indexes
         index1=3*3*width*upperplots+3*leftplots+1;
         index2=index1+1;
@@ -28 +28 @@
 [tensor.yy datatype]=processdata(md,tensor.yy,options);
 [tensor.xy datatype]=processdata(md,tensor.xy,options);
-if  strcmp(meshtype(md.mesh),'3D')
+if  meshdim(md.mesh)==3
         [tensor.xz datatype]=processdata(md,tensor.xz,options);
         [tensor.yz datatype]=processdata(md,tensor.yz,options);
@@ -34 +34 @@
 end
 
-if ((strcmp(meshtype(md.mesh),'2Dhorizontal'))),
+if ((strcmp(meshxdim(md.mesh),'2Dhorizontal'))),
         subplot(2*width,2*width,index1),
         plot_unit(x,y,z,elements,tensor.xx,is2d,isplanet,datatype,options)

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

@@ -10 +10 @@
 upperplots=fix((i-1)/width);
 if upperplots==0, leftplots=i-1; else leftplots=i-width*upperplots-1; end
-if (strcmp(meshtype(md.mesh),'2Dhorizontal'))%3 components -> 3 indexes
+if (meshdim(md.mesh)==2)%3 components -> 3 indexes
         index1=4*width*upperplots+2*leftplots+1;
         index2=index1+1;
@@ -16 +16 @@
         index4=index3+1;
         newwidth=2*width;
-elseif strcmp(meshtype(md.mesh),'3D')%6 components -> 6 indexes
+elseif meshdim(md.mesh)==3%6 components -> 6 indexes
         index1=3*3*width*upperplots+3*leftplots+1;
         index2=index1+1;
@@ -31 +31 @@
 type2=[type 'axis2'];
 plot_tensor_principalaxis(md,options,newwidth,index2,tensor,type2,plot_options);
-if  strcmp(meshtype(md.mesh),'3D')
+if  meshdim(md.mesh)==3
         type3=[type 'axis3'];
         plot_tensor_principalaxis(md,options,newwidth,index3,tensor,type3,plot_options);
@@ -40 +40 @@
 [tensor.principalvalue1 datatype]=processdata(md,tensor.principalvalue1,options);
 [tensor.principalvalue2 datatype]=processdata(md,tensor.principalvalue2,options);
-if  strcmp(meshtype(md.mesh),'3D')
+if  meshdim(md.mesh)==3
         [tensor.principalvalue3 datatype]=processdata(md,tensor.principalvalue3,options);
 end
 
-if ((strcmp(meshtype(md.mesh),'2Dhorizontal'))),
+if meshdim(md.mesh)==2,
         subplot(2*width,2*width,index3)
         plot_unit(x,y,z,elements,tensor.principalvalue1,is2d,isplanet,datatype,options)

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

@@ -13 +13 @@
 [x y z elements is2d isplanet]=processmesh(md,[],options);
 
-if ((strcmp(meshtype(md.mesh),'2Dhorizontal'))),
+if meshdim(md.mesh)==2,
         eval(['Vx=tensor.principalaxis' type(end) '(:,1); Vy=tensor.principalaxis' type(end) '(:,2);'])
         eval(['value=tensor.principalvalue' type(end) ';']);
@@ -33 +33 @@
 
 %plot quivers
-if (strcmp(meshtype(md.mesh),'2Dhorizontal')),
+if meshdim(md.mesh)==2,
 
         %density

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

@@ -41 +41 @@
 clear string;
 
-if strcmp(meshtype(md.mesh),'3D'),
+if strcmp(meshxdim(md.mesh),'3D'),
         string='plotmodel(md';
         for i=1:length(md.results.transient),
@@ -67 +67 @@
 clear string;
 
-if strcmp(meshtype(md.mesh),'3D'),
+if strcmp(meshxdim(md.mesh),'3D'),
         string='plotmodel(md';
         for i=2:length(md.results.transient),

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

@@ -23 +23 @@
 
 %special case for mesh 2dvertical
-if strcmp(meshtype(md.mesh),'2Dvertical'),
+if strcmp(meshxdim(md.mesh),'2Dvertical'),
         [data datatype] = processdata(md.mesh,md,data,options);
         return;
@@ -56 +56 @@
 
 %check length
-if datasize(1)~=md.mesh.numberofvertices & datasize(1)~=md.mesh.numberofelements & datasize(1)~=md.mesh.numberofvertices*6 & (strcmp(md.mesh.meshtype(),'3D') & ~(datasize(1)==numberofelements2d | datasize(1)==numberofvertices2d))
+if datasize(1)~=md.mesh.numberofvertices & datasize(1)~=md.mesh.numberofelements & datasize(1)~=md.mesh.numberofvertices*6 & (strcmp(md.mesh.meshxdim(),'3D') & ~(datasize(1)==numberofelements2d | datasize(1)==numberofvertices2d))
         error('plotmodel error message: data not supported yet');
 end
@@ -65 +65 @@
 
         %check number of columns, add zeros if necessary,
-        if (strcmp(md.mesh.meshtype(),'3D'))
+        if (strcmp(md.mesh.meshxdim(),'3D'))
                 if datasize(2)==2,
                         data=[data, zeros(datasize(1),1)];
@@ -85 +85 @@
 
 %treat the case datasize(1)=nodes2d
-if (strcmp(md.mesh.meshtype(),'3D') & datasize(1)==numberofvertices2d),
+if (strcmp(md.mesh.meshxdim(),'3D') & datasize(1)==numberofvertices2d),
         data=project3d(md,'vector',data,'type','node');
         datasize(1)=md.mesh.numberofvertices;
@@ -92 +92 @@
 
 %treat the case datasize(1)=nodes2d
-if (strcmp(md.mesh.meshtype(),'3D') & datasize(1)==numberofelements2d),
+if (strcmp(md.mesh.meshxdim(),'3D') & datasize(1)==numberofelements2d),
         data=project3d(md,'vector',data,'type','element');
         datasize(1)=md.mesh.numberofelements;

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

@@ -16 +16 @@
 
 %special case for mesg 2dvertical
-if strcmp(meshtype(md.mesh),'2Dvertical'),
+if strcmp(meshxdim(md.mesh),'2Dvertical'),
         [x y z elements is2d isplanet] = processmesh(md.mesh,options);
         return;
@@ -46 +46 @@
 
 %is it a 2d plot?
-if ~strcmp(md.mesh.meshtype(),'3D');
+if md.mesh.meshdim()==2,
         is2d=1;
 else

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

@@ -42 +42 @@
 
                 #is it a 2D plot?
-                if m.strcmp(md.mesh.meshtype(),'2Dhorizontal'):
+                if m.strcmp(md.mesh.meshxdim(),'2Dhorizontal'):
                         is2d=1
-                elif m.strcmp(md.mesh.meshtype(),'3D'):
+                elif m.strcmp(md.mesh.meshxdim(),'3D'):
                         if options.getfieldvalue('layer',0)>=1:
                                 is2d=1
@@ -64 +64 @@
         else:
                 #Process mesh for plotting 
-                if m.strcmp(md.mesh.meshtype(),'2Dhorizontal'):
+                if m.strcmp(md.mesh.meshxdim(),'2Dhorizontal'):
                         is2d=1
                 else: