Changeset 25587

Timestamp:

09/20/20 16:36:58 (4 years ago)

Author:

Eric.Larour

Message:

CHG: diverse

Location:

issm/branches/trunk-larour-SLPS2020/src/m/plot

Files:

• plot_coastlines.m (modified) (4 diffs)
• processdata.m (modified) (1 diff)
• processdatalatlong.m (added)
• processmesh.m (modified) (3 diffs)
• subplotmodel.m (modified) (2 diffs)

issm/branches/trunk-larour-SLPS2020/src/m/plot/plot_coastlines.m

@@ -2 +2 @@
 
 %define coastline: {{{
-coast=[-83.83 -180 ;...
+coast=[-90 -180; ...
+        -83.83 -180 ;...
 -84.33 -178 ;...
 -84.5 -174 ;...
@@ -614 +615 @@
 -83.5 176 ;...
 -83.83 180 ;...
+-85 180 ;...
+-87 180 ;...
+-90 180 ;...
 NaN NaN ;...
 -77.58 166.33 ;...
@@ -9866 +9870 @@
 19.77 -156.05 ;...
 19.95 -155.87 ;...
-20.27 -155.88 ];
+20.27 -155.88 ;...
+NaN NaN];
 
-coastlat=coast(:,1);
-coastlon=coast(:,2);
+coastlat=[coast(:,1); coast(:,1)];
+coastlon=[coast(:,2); coast(:,2)-360];
 
 %}}}
@@ -9902 +9907 @@
                 p=polyshape(coastlon,coastlat);
                 plot(p,'FaceColor','w','FaceAlpha',1);
+                if strcmpi(getfieldvalue(options,'coordcent','atlantic'),'pacific'),
+                        xlim(getfieldvalue(options,'xlim',[-360 0]));
+                else 
+                        xlim(getfieldvalue(options,'xlim',[-180 180]));
+                end
                 %p=plot(coastlon,coastlat,'k-'); 
         end

issm/branches/trunk-larour-SLPS2020/src/m/plot/processdata.m

@@ -42 +42 @@
 end
 
+%special case for coord latlong: 
+if strcmpi(getfieldvalue(options,'coord','xy'),'latlon') | strcmpi(getfieldvalue(options,'coord','xy'),'latlong'),
+        [data datatype] = processdatalatlong(md,data,options);
+        return;
+end
+
 %needed later on
 if isprop(md.mesh,'numberofvertices2d'), 

issm/branches/trunk-larour-SLPS2020/src/m/plot/processmesh.m

@@ -24 +24 @@
 if strcmp(domaintype(md.mesh),'3Dsurface'),
         [x y z elements is2d isplanet] = processmesh(md.mesh,options);
-        if strcmpi(getfieldvalue(options,'coord','xy'),'latlon'),
-                x=md.mesh.long;
-                y=md.mesh.lat;
+        if strcmpi(getfieldvalue(options,'coord','xy'),'latlon') | strcmpi(getfieldvalue(options,'coord','xy'),'latlong'),
+                x0=md.mesh.long;
+                y0=md.mesh.lat;
+                %add row at lat=90 and lat=-90
+                add=[(-180:.1:-1e-5)';(1e-5:.1:180)'];
+                nadd=length(add);
+                xextra=[add;add];
+                yextra=[90*ones(nadd,1); -90*ones(nadd,1)];
+                x=[x0;xextra];
+                y=[y0;yextra];
+
+                if strcmpi(getfieldvalue(options,'coordcent','atlantic'),'pacific'),
+                        pos=find(x>0);  x(pos)=-360+x(pos);
+                end
                 elements=delaunay(x,y);
-                z=md.mesh.lat; z(:)=0;
+                z=x; z(:)=0;
         end
         return;
@@ -42 +53 @@
 else
         elements=md.mesh.elements;
-        if ~strcmpi(getfieldvalue(options,'coord','xy'),'latlon') ,
+        if ~strcmpi(getfieldvalue(options,'coord','xy'),'latlon') &  ~strcmpi(getfieldvalue(options,'coord','xy'),'latlong') ,
                 x=md.mesh.x;
                 if isprop(md.mesh,'x2d'), x2d=md.mesh.x2d; end
@@ -50 +61 @@
                 x=md.mesh.long;
                 y=md.mesh.lat;
+                if strcmpi(getfieldvalue(options,'coordcent','atlantic'),'pacific'),
+                        pos=find(x>0);  x(pos)-360+x(pos);
+                end
         end
 end

issm/branches/trunk-larour-SLPS2020/src/m/plot/subplotmodel.m

@@ -25 +25 @@
 ymin   = 1-vmargin(2)-height; 
 
+box=getfieldvalue(options,'box','off');
+if strcmpi(box,'on'),
+        visible='on';
+else
+        visible='off';
+end
+
 for i = 1:nlines
         xmin = hmargin(1);
@@ -30 +37 @@
                 if(((i-1)*ncols+j)==num)
                         ha = axes('Units','normalized', ...
-                                'Position',[xmin ymin width height],'XTickLabel','','YTickLabel','','Visible','off');
+                                'Position',[xmin ymin width height],'XTickLabel','','YTickLabel','',...
+                                'Visible',visible,'box',box);
                         return
                 end