Changeset 8728

Timestamp:

06/28/11 00:40:35 (14 years ago)

Author:

Eric.Larour

Message:

New planet class, derived from model. New plots
for planet class.

Location:

issm/trunk/src/m

Files:

• classes/version/7.7/model.m (modified) (1 diff)
• classes/version/7.7/planet.m (added)
• model/plot/applyoptions.m (modified) (1 diff)
• model/plot/plot_mesh.m (modified) (2 diffs)
• model/plot/plot_qmuhistnorm.m (modified) (1 diff)
• model/plot/plot_section.m (modified) (4 diffs)
• model/plot/plot_unit.m (modified) (1 diff)
• model/plot/processmesh.m (modified) (1 diff)
• planet (added)
• planet/mesh_refine_tri4.m (added)
• planet/planetmixedmesh.m (added)
• planet/planettrimesh.m (added)
• planet/runme.m (added)
• planet/sphere_project.m (added)
• planet/sphere_tri.m (added)

issm/trunk/src/m/classes/version/7.7/model.m

@@ -26 +26 @@
                  bamg=struct();
                  dim=0;
-                 planet=0;
                  numberofelements=0;
                  numberofnodes=0;

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

@@ -222 +222 @@
         if exist(options,'colorbartitle'),
                 set(get(c,'title'),'FontSize',getfieldvalue(options,'colorbarfontsize',fontsize),'String',getfieldvalue(options,'colorbartitle'),...
-                        'Color',getfieldvalue(options,'FontColor','k'),'Interpreter',getfieldvalue(options,'Interpreter','none'));
+                        'Color',getfieldvalue(options,'FontColor','k'),'Interpreter',getfieldvalue(options,'Interpreter','none'),'Interpreter','Tex');
         end
         if exist(options,'colorbarYLabel'),

issm/trunk/src/m/model/plot/plot_mesh.m

@@ -22 +22 @@
         patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
 else
-        if ~md.planet,
+        if ~isplanet,
                 A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4); E=elements(:,5); F=elements(:,6);
                 patch( 'Faces', [A B C],  'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
@@ -30 +30 @@
                 patch( 'Faces', [C A D F],'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
         else
-                A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4); 
+                A=elements(:,1); B=elements(:,2); C=elements(:,3); 
+                if (size(elements,2)==4), D=elements(:,4); else D=C; end
                 patch( 'Faces', [A B C D],  'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
-
         end
 end

issm/trunk/src/m/model/plot/plot_qmuhistnorm.m

@@ -38 +38 @@
 if exist(options,'cdfleg'), cdfleg=getfieldvalue(options,'cdfleg'); qmuoptions=[qmuoptions ',''cdfleg'',''' cdfleg '''']; end
 if exist(options,'nrmplt'), nrmplt=getfieldvalue(options,'nrmplt'); qmuoptions=[qmuoptions ',''nrmplt'',''' nrmplt '''']; end
+if exist(options,'EdgeColor'), EdgeColor=getfieldvalue(options,'EdgeColor'); qmuoptions=[qmuoptions ',''EdgeColor'',''' EdgeColor '''']; end
+if exist(options,'FaceColor'), FaceColor=getfieldvalue(options,'FaceColor'); qmuoptions=[qmuoptions ',''FaceColor'',''' FaceColor '''']; end
 
 %use qmu plot

issm/trunk/src/m/model/plot/plot_section.m

@@ -25 +25 @@
 %Get number of curves and generate random colors
 numcurves=size(data,2);
-colorm=getfieldvalue(options,'colormap','jet');
-color=eval([ colorm '(numcurves);']);
+colorm=getfieldvalue(options,'colormap','lines');
+color=eval([ colorm '(numcurves);'])
 options=removefield(options,'colormap',0); %back to default colormap
 
@@ -35 +35 @@
 end
 
-%Loop over number of curves
-for i=1:numcurves,
-
-        [datai datatype]=processdata(md3d,data(:,i),options);
-
-        %resolution
-        if exist(options,'resolution'),
-                resolution=getfieldvalue(options,'resolution');
-        else %Default resolution
-                resolution=[1000 10*md.numlayers];
-                disp(['plot_section warning: no resolution specified, use default resolution: [horizontal_resolution vertical_resolution]=[' num2str(resolution)  ']']);
-        end
-
-        %Compute section value
-        [elements,x,y,z,s,data_s]=SectionValues(md,datai,getfieldvalue(options,'sectionvalue'),resolution);
-
-        %units
-        if exist(options,'unit'),
-                unit=getfieldvalue(options,'unit');
-                x=x*unit;
-                y=y*unit;
-                z=z*unit;
-                s=s*unit;
-        end
-
-        %2D
-        if is2d
-
-                %Show Section if requested by user
-                if exist(options,'showsection')
-
-                        %compute number of labels
-                        numlabels=min(getfieldvalue(options,'showsection'),length(s));
-                        shift=fix(length(s)/numlabels);
-
-                        %plot labels on current graph
-                        hold on
-                        text(s(1),data_s(1),'1','backgroundcolor',[0.8 0.9 0.8])
-                        for i=2:numlabels-1
-                                text(s(1+(i-1)*shift),data_s(1+(i-1)*shift),num2str(i),'backgroundcolor',[0.8 0.9 0.8])
-                        end
-                        text(s(end),data_s(end),'end','backgroundcolor',[0.8 0.9 0.8])
-
-                        %plot section only with labels
-                        subplot(nlines,ncols,index2)
-                        plot_unit(x_m,y_m,z_m,elements_m,data(:,i),is2d,isplanet,datatype,options)
-                        hold on
-                        text(x(1),y(1),'1','backgroundcolor',[0.8 0.9 0.8])
-                        for i=2:numlabels-1
-                                text(x(1+(i-1)*shift),y(1+(i-1)*shift),num2str(i),'backgroundcolor',[0.8 0.9 0.8])
-                        end
-                        text(x(end),y(end),'end','backgroundcolor',[0.8 0.9 0.8])
-                        plot(x,y,'-r')
-                        axis([min(md.x)-1 max(md.x)+1 min(md.y)-1 max(md.y)+1])
-                        view(2)
+%read contours: 
+profiles=expread(getfieldvalue(options,'sectionvalue'),1);
+numprofiles=length(profiles);
+
+%Loop over number of profiles: 
+for profile_i=1:numprofiles,
+        profile=profiles(profile_i);
+
+        %Loop over number of curves
+        for i=1:numcurves,
+
+                [datai datatype]=processdata(md3d,data(:,i),options);
+
+                %resolution
+                if exist(options,'resolution'),
+                        resolution=getfieldvalue(options,'resolution');
+                else %Default resolution
+                        resolution=[1000 10*md.numlayers];
+                        disp(['plot_section warning: no resolution specified, use default resolution: [horizontal_resolution vertical_resolution]=[' num2str(resolution)  ']']);
                 end
 
-                %plot section value
-                hold on;
-                subplot(nlines,ncols,index1)
-                %subplot(1,3,[2 3])
-                if i==1,
-                        plot(s,data_s,'-','color','k','LineWidth',getfieldvalue(options,'linewidth',1))
-                elseif i==2,
-                        plot(s,data_s,':','color',color(i,:),'LineWidth',getfieldvalue(options,'linewidth',1))
-                else
-                        plot(s,data_s,'--','color',color(i,:),'LineWidth',getfieldvalue(options,'linewidth',1))
+                %Compute section value
+                [elements,x,y,z,s,data_s]=SectionValues(md,datai,profile,resolution);
+
+                %units
+                if exist(options,'unit'),
+                        unit=getfieldvalue(options,'unit');
+                        x=x*unit;
+                        y=y*unit;
+                        z=z*unit;
+                        s=s*unit;
                 end
 
-
-                %3D
-        else
-                %plot section value
-                %if user requested view2: 2d plot with curvilinear coordinate
-                if (getfieldvalue(options,'view',3)==2 )
+                %2D
+                if is2d
 
                         %Show Section if requested by user
@@ -120 +80 @@
                                 %plot labels on current graph
                                 hold on
-                                text(s(1),z(1),'1','backgroundcolor',[0.8 0.9 0.8])
+                                text(s(1),data_s(1),'1','backgroundcolor',[0.8 0.9 0.8])
                                 for i=2:numlabels-1
-                                        text(s(1+(i-1)*shift),z(1+(i-1)*shift),num2str(i),'backgroundcolor',[0.8 0.9 0.8])
-                                end
-                                text(s(end),z(end),'end','backgroundcolor',[0.8 0.9 0.8])
+                                        text(s(1+(i-1)*shift),data_s(1+(i-1)*shift),num2str(i),'backgroundcolor',[0.8 0.9 0.8])
+                                end
+                                text(s(end),data_s(end),'end','backgroundcolor',[0.8 0.9 0.8])
 
                                 %plot section only with labels
                                 subplot(nlines,ncols,index2)
-                                plot_unit(x_m,y_m,z_m,elements_m,data(:,i),is2d,datatype,options)
+                                plot_unit(x_m,y_m,z_m,elements_m,data(:,i),is2d,isplanet,datatype,options)
                                 hold on
                                 text(x(1),y(1),'1','backgroundcolor',[0.8 0.9 0.8])
@@ -140 +100 @@
                         end
 
+                        %plot section value
+                        hold on;
                         subplot(nlines,ncols,index1)
-                        A=elements(:,1); B=elements(:,2); C=elements(:,3);  D=elements(:,4); 
-                        patch( 'Faces', [A B C D], 'Vertices', [s z zeros(length(s),1)],'FaceVertexCData',data_s,'FaceColor','interp','EdgeColor','none');
-
+                        %subplot(1,3,[2 3])
+                        plot(s,data_s,'color',color(i,:),'LineWidth',getfieldvalue(options,'linewidth',1))
+
+
+                        %3D
                 else
-
-                        %Show Section if requested by user
-                        if exist(options,'showsection')
-
-                                %compute number of labels
-                                numlabels=min(getfieldvalue(options,'showsection'),length(s));
-                                shift=fix(length(x)/numlabels);
-
-                                %plot labels on current graph
-                                hold on
-                                text(x(1),y(1),z(1),'1','backgroundcolor',[0.8 0.9 0.8])
-                                for i=2:numlabels-1
-                                        text(x(1+(i-1)*shift),y(1+(i-1)*shift),z(1+(i-1)*shift),num2str(i),'backgroundcolor',[0.8 0.9 0.8])
-                                end
-                                text(x(end),y(end),z(end),'end','backgroundcolor',[0.8 0.9 0.8])
-
-                                %plot section only with labels
-                                subplot(nlines,ncols,index2)
-                                plot_unit(x_m,y_m,z_m,elements_m,data,is2d,datatype,options)
-                                hold on
-                                text(x(1),y(1),'1','backgroundcolor',[0.8 0.9 0.8])
-                                for i=2:numlabels-1
-                                        text(x(1+(i-1)*shift),y(1+(i-1)*shift),num2str(i),'backgroundcolor',[0.8 0.9 0.8])
-                                end
-                                text(x(end),y(end),'end','backgroundcolor',[0.8 0.9 0.8])
-                                plot(x,y,'-r')
-                                axis([min(md.x)-1 max(md.x)+1 min(md.y)-1 max(md.y)+1])
-                                view(2)
+                        %plot section value
+                        %if user requested view2: 2d plot with curvilinear coordinate
+                        if (getfieldvalue(options,'view',3)==2 )
+
+                                %Show Section if requested by user
+                                if exist(options,'showsection')
+
+                                        %compute number of labels
+                                        numlabels=min(getfieldvalue(options,'showsection'),length(s));
+                                        shift=fix(length(s)/numlabels);
+
+                                        %plot labels on current graph
+                                        hold on
+                                        text(s(1),z(1),'1','backgroundcolor',[0.8 0.9 0.8])
+                                        for i=2:numlabels-1
+                                                text(s(1+(i-1)*shift),z(1+(i-1)*shift),num2str(i),'backgroundcolor',[0.8 0.9 0.8])
+                                        end
+                                        text(s(end),z(end),'end','backgroundcolor',[0.8 0.9 0.8])
+
+                                        %plot section only with labels
+                                        subplot(nlines,ncols,index2)
+                                        plot_unit(x_m,y_m,z_m,elements_m,data(:,i),is2d,datatype,options)
+                                        hold on
+                                        text(x(1),y(1),'1','backgroundcolor',[0.8 0.9 0.8])
+                                        for i=2:numlabels-1
+                                                text(x(1+(i-1)*shift),y(1+(i-1)*shift),num2str(i),'backgroundcolor',[0.8 0.9 0.8])
+                                        end
+                                        text(x(end),y(end),'end','backgroundcolor',[0.8 0.9 0.8])
+                                        plot(x,y,'-r')
+                                        axis([min(md.x)-1 max(md.x)+1 min(md.y)-1 max(md.y)+1])
+                                        view(2)
+                                end
+
+                                subplot(nlines,ncols,index1)
+                                A=elements(:,1); B=elements(:,2); C=elements(:,3);  D=elements(:,4); 
+                                patch( 'Faces', [A B C D], 'Vertices', [s z zeros(length(s),1)],'FaceVertexCData',data_s,'FaceColor','interp','EdgeColor','none');
+
+                        else
+
+                                %Show Section if requested by user
+                                if exist(options,'showsection')
+
+                                        %compute number of labels
+                                        numlabels=min(getfieldvalue(options,'showsection'),length(s));
+                                        shift=fix(length(x)/numlabels);
+
+                                        %plot labels on current graph
+                                        hold on
+                                        text(x(1),y(1),z(1),'1','backgroundcolor',[0.8 0.9 0.8])
+                                        for i=2:numlabels-1
+                                                text(x(1+(i-1)*shift),y(1+(i-1)*shift),z(1+(i-1)*shift),num2str(i),'backgroundcolor',[0.8 0.9 0.8])
+                                        end
+                                        text(x(end),y(end),z(end),'end','backgroundcolor',[0.8 0.9 0.8])
+
+                                        %plot section only with labels
+                                        subplot(nlines,ncols,index2)
+                                        plot_unit(x_m,y_m,z_m,elements_m,data,is2d,datatype,options)
+                                        hold on
+                                        text(x(1),y(1),'1','backgroundcolor',[0.8 0.9 0.8])
+                                        for i=2:numlabels-1
+                                                text(x(1+(i-1)*shift),y(1+(i-1)*shift),num2str(i),'backgroundcolor',[0.8 0.9 0.8])
+                                        end
+                                        text(x(end),y(end),'end','backgroundcolor',[0.8 0.9 0.8])
+                                        plot(x,y,'-r')
+                                        axis([min(md.x)-1 max(md.x)+1 min(md.y)-1 max(md.y)+1])
+                                        view(2)
+                                end
+
+                                subplot(nlines,ncols,index1)
+                                A=elements(:,1); B=elements(:,2); C=elements(:,3);  D=elements(:,4); 
+                                patch( 'Faces', [A B C D], 'Vertices', [x y z],'FaceVertexCData',data_s,'FaceColor','interp','EdgeColor','none');
+                                view(3)
+
                         end
-
-                        subplot(nlines,ncols,index1)
-                        A=elements(:,1); B=elements(:,2); C=elements(:,3);  D=elements(:,4); 
-                        patch( 'Faces', [A B C D], 'Vertices', [x y z],'FaceVertexCData',data_s,'FaceColor','interp','EdgeColor','none');
-                        view(3)
-
                 end
         end

issm/trunk/src/m/model/plot/plot_unit.m

@@ -42 +42 @@
                                 patch( 'Faces', [C A D F],'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
                         else
-                                A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4); 
+                                A=elements(:,1); B=elements(:,2); C=elements(:,3); 
+                                if size(elements,2)==4, D=elements(:,4); else D=C; end
                                 patch( 'Faces', [A B C D],  'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
                         end

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

@@ -92 +92 @@
 end
 
-if md.planet,
+if isa(md,'planet'),
         isplanet=1;
 else