Changeset 6286

Timestamp:

10/14/10 09:27:49 (14 years ago)

Author:

Eric.Larour

Message:

screwed matlab goddammit

Location:

issm/trunk/src/m/model

Files:

• SectionValues.m (modified) (1 diff)
• mechanicalproperties.m (modified) (1 diff)
• plot/applyoptions.m (modified) (1 diff)
• plot/plot_manager.m (modified) (1 diff)
• plot/plot_quiver.m (modified) (3 diffs)
• plot/plot_riftpenetration.m (modified) (2 diffs)
• plot/plot_riftrelvel.m (modified) (2 diffs)
• plot/plotdoc.m (modified) (2 diffs)
• plot/quiver_colorbar.m (modified) (1 diff)
• radarpower.m (modified) (2 diffs)

issm/trunk/src/m/model/SectionValues.m

@@ -82 +82 @@
 
         %Interpolation of data on specified points
-        data_interp=InterpFromMeshToMesh2d(md.elements,md.x,md.y,data,X,Y);
+        %data_interp=InterpFromMeshToMesh2d(md.elements,md.x,md.y,data,X,Y);
+        data_interp=griddata(md.x,md.y,data,X,Y);
 
         %Compute index

issm/trunk/src/m/model/mechanicalproperties.m

@@ -48 +48 @@
 %compute viscosity
 nu=zeros(numberofelements,1);
-B_bar=md.B(index)*summation/3;
-power=(md.n-1)./(2*md.n);
+B_bar=md.rheology_B(index)*summation/3;
+power=(md.rheology_n-1)./(2*md.rheology_n);
 second_inv=(ux.^2+vy.^2+((uy+vx).^2)/4+ux.*vy);
 %some corrections

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

@@ -191 +191 @@
 else
         %do nothing
+        
 end
 

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

@@ -105 +105 @@
                         plot_segments(md,options,subplotwidth,i,data)
                         return
+                
+                case 'quiver'
+                        plot_quiver(md,options,nlines,ncols,i);
+                        return
+
                 case {'strainrate_tensor','strainrate','strainrate_principal','strainrate_principalaxis1','strainrate_principalaxis2','strainrate_principalaxis3',...
                                 'stress_tensor','stress','stress_principal','stress_principalaxis1','stress_principalaxis2','stress_principalaxis3',...

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

@@ -1 @@
-function plot_quiver(x,y,u,v,options),
+function plot_quiver(md,options,nlines,ncols,index);
 %PLOT_QUIVER - quiver plot with colors
 %
@@ -10 +10 @@
 %      plot_quiver(md.x,md.y,md.vx,md.vy,options);
 
+%prepare plot
+subplot(nlines,ncols,index); 
+hold on
+
+fields=getfieldvalue(options,'quiver_field',{'vx','vy'});
+
+%call fields vx and vy, for ease of use
+if ischar(fields{1}), vx=md.(fields{1}); else vx=fields{1}; end
+if ischar(fields{2}), vy=md.(fields{2}); else vy=fields{2}; end
+
 %process fields
-[quivers,palette]=quiver_process(x,y,u,v,options);
+[quivers,palette]=quiver_process(md.x,md.y,vx,vy,options);
 
 %loop over the number of colors
@@ -25 +35 @@
 %take care of colorbar
 quiver_colorbar(quivers,options);
+
+
+%apply options
+options=addfielddefault(options,'title','Quiver plot.');
+options=addfielddefault(options,'colorbar',1);
+applyoptions(md,[],options);

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

@@ -58 +58 @@
                 plot(x(md.rifts(i).tips(2)),y(md.rifts(i).tips(2)),'g*');
         end
-        if isp1 & isp2
-                legend([h1,h2,p1,p2],'mesh boundaries','rift tips',' rifts closing','rifts opening')
-        elseif isp1
-                legend([h1,h2,p1],'mesh boundaries','rift tips',' rifts closing')
-        elseif isp2
-                legend([h1,h2,p2],'mesh boundaries','rift tips','rifts opening')
-        else
-                legend([h1,h2],'mesh boundaries','rift tips')
+        if strcmpi(getfieldvalue(options,'legend','on'),'on'),
+                if isp1 & isp2
+                        l=legend([h1,h2,p1,p2],'mesh boundaries','crack tips','faults','rifts');
+                elseif isp1
+                        l=legend([h1,h2,p1],'mesh boundaries','crack tips','faults');
+                elseif isp2
+                        l=legend([h1,h2,p2],'mesh boundaries','crack tips','rifts');
+                else
+                        l=legend([h1,h2],'mesh boundaries','crack tips');
+                end
+                set(l,'Location',getfieldvalue(options,'legend_location','NorthEast'));
         end
 else
@@ -73 +76 @@
 
 %apply options
-options=addfielddefault(options,'title','Rift Penetration');
+options=addfielddefault(options,'title','Rift/Fault location');
 options=addfielddefault(options,'colorbar',0);
 applyoptions(md,[],options);

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

@@ -65 +65 @@
         segments=md.rifts(i).segments;
         for j=1:size(segments,1),
-                plot(x(segments(j,1:2)),y(segments(j,1:2)),'b-');
+                plot(x(segments(j,1:2)),y(segments(j,1:2)),'k-');
         end
 
@@ -76 +76 @@
                 penetration=(vx2-vx1)*normal(1)+(vy2-vy1)*normal(2);
                 %if penetration is negative, plot in black, positive, plot in red;: ie: if rift is closing, black, if rift is opening, red.
-                if(penetration>0),
-                        p2=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'*'); set(p2,'Color',[140 140 140]/255);
-                        isp2=1;
-                else
-                        p1=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'k*');
-                        isp1=1;
-                end
+                %if(penetration>0),
+                %       p2=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'*'); set(p2,'Color',[140 140 140]/255);
+                %       isp2=1;
+                %else
+                %       p1=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'k*');
+                %       isp1=1;
+                %end
         end
 
         %point out the tips
-        h2=plot(x(md.rifts(i).tips(1)),y(md.rifts(i).tips(1)),'g*');
-        plot(x(md.rifts(i).tips(2)),y(md.rifts(i).tips(2)),'g*');
-        segments=md.rifts(i).segments(:,1:2);
+        %h2=plot(x(md.rifts(i).tips(1)),y(md.rifts(i).tips(1)),'g*');
+        %plot(x(md.rifts(i).tips(2)),y(md.rifts(i).tips(2)),'g*');
+        %segments=md.rifts(i).segments(:,1:2);
 end
 %legend
-if isp1 & isp2
-        legend([h1,h2,p1,p2],'mesh boundaries','rift tips',' rifts closing','rifts opening')
-elseif isp1
-        legend([h1,h2,p1],'mesh boundaries','rift tips',' rifts closing')
-elseif isp2
-        legend([h1,h2,p2],'mesh boundaries','rift tips','rifts opening')
-else
-        legend([h1,h2],'mesh boundaries','rift tips')
+if strcmpi(getfieldvalue(options,'legend','on'),'on'),
+        if isp1 & isp2
+                l=legend([h1,h2,p1,p2],'mesh boundaries','crack tips','faults','rifts');
+        elseif isp1
+                l=legend([h1,h2,p1],'mesh boundaries','crack tips','faults');
+        elseif isp2
+                l=legend([h1,h2,p2],'mesh boundaries','crack tips','rifts');
+        else
+                l=legend([h1,h2],'mesh boundaries','crack tips');
+        end
+set(l,'Location',getfieldvalue(options,'legend_location','NorthEast'));
 end
 hold off
+
+
 
 %apply options
 quiver_colorbar(quivers,options);
 options=changefieldvalue(options,'colorbar',2);
-options=addfielddefault(options,'title','Rift Relative Velocities');
+options=addfielddefault(options,'title','Rift/Fault Relative Velocity');
 applyoptions(md,[],options);

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

@@ -50 +50 @@
 disp('                  - ''qmustddev'': plot of stddev distribution in sampling analysis with scaled response. needs option qmudata for descriptor');
 disp('                  - ''part_hist'': partitioning node and area histogram');
+disp('                  - ''quiver'': quiver plot. specify quiver fields. ''quiver_field'',{''vx'',''vy''} (default) or ''quiver_field'',{field1,field2}');
 
 disp('       ''alloptions'': apply the options to all subplots if ''on''');
@@ -125 +126 @@
 disp('       ''wrapping'': repeat ''n'' times the colormap (''n'' must be an integer)');
 disp('       ''unit'': by default, in m, otherwise, ''km'' is available');
+disp('       ''legend_position'': by default, ''NorthEasth''');
 disp('       ''qmudata'': data for qmu  plots.');
 disp('                  {dresp1   ,dresp2  ,hmin,hmax,hnint} or {samp,desc,mu,sigma,hmin,hmax,hnint}');

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

@@ -34 +34 @@
         if exist(options,'colorbartitle'),
                 backup=gca;
-                axes(hcb);lab=ylabel(getfieldvalue(options,'colorbartitle'));
-                set(lab,'Rotation',getfieldvalue(options,'colorbartitlerotation',-90));
+                axes(hcb);lab=title(getfieldvalue(options,'colorbartitle'));
+                set(lab,'Rotation',getfieldvalue(options,'colorbartitlerotation',0));
                 set(lab,'VerticalAlignment','bottom');
                 axes(backup);

issm/trunk/src/m/model/radarpower.m

@@ -21 +21 @@
 y0=min(ylim);
 y1=max(ylim);
-
-%Get path  to gdal binaries
-path_gdal=[ISSM_TIER '/externalpackages/gdal/install/bin/'];
-
-%Was gdal compiled? 
-if ~exist([path_gdal 'gdal_translate']),
-        error(['radarpower error message: GDAL library needs to be compiled to use this routine. Compile GDAL in ' ISSM_TIER '/externalpackages/gdal to use this routine.']);
-end
 
 %the geotiff image is either 200m or 1km accuracy. 
@@ -64 +56 @@
         %Name of image
         inputname='./temp.tif';
-        system([path_gdal 'gdal_translate -quiet -projwin ' num2str(x0) ' ' num2str(y1) ' ' num2str(x1) ' ' num2str(y0) ' ' geotiff_name ' ' inputname ]);
+        eval(['!gdal_translate -quiet -projwin ' num2str(x0) ' ' num2str(y1) ' ' num2str(x1) ' ' num2str(y0) ' ' geotiff_name ' ' inputname ]);
 
         %Read in temp.tif: