Changeset 13975 for issm/trunk/src/m/exp

Timestamp:

11/16/12 08:10:16 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/exp/expcoarsen.m (modified) (1 diff)
• src/m/exp/expcontract.m (modified) (1 diff)
• src/m/exp/expcreatecontour.m (modified) (2 diffs)
• src/m/exp/expcreateprofile.m (modified) (1 diff)
• src/m/exp/expexcludeoutliers.m (modified) (1 diff)
• src/m/exp/expflip.m (modified) (1 diff)
• src/m/exp/expll2xy.m (modified) (1 diff)
• src/m/exp/expread.m (modified) (1 diff)
• src/m/exp/expswapxy.m (modified) (1 diff)
• src/m/exp/exptool.m (modified) (1 diff)
• src/m/exp/expwrite.m (modified) (3 diffs)
• src/m/exp/expxy2ll.m (modified) (1 diff)
• src/m/exp/manipulation/addcontour.m (modified) (3 diffs)
• src/m/exp/manipulation/addendprofile.m (modified) (2 diffs)
• src/m/exp/manipulation/addinsideprofile.m (modified) (2 diffs)
• src/m/exp/manipulation/addprofile.m (modified) (3 diffs)
• src/m/exp/manipulation/closeprofile.m (modified) (3 diffs)
• src/m/exp/manipulation/cutarea.m (modified) (2 diffs)
• src/m/exp/manipulation/cutprofile.m (modified) (2 diffs)
• src/m/exp/manipulation/mergeprofiles.m (modified) (1 diff)
• src/m/exp/manipulation/modifyposition.m (modified) (2 diffs)
• src/m/exp/manipulation/orientprofile.m (modified) (2 diffs)
• src/m/exp/manipulation/removepoints.m (modified) (2 diffs)
• src/m/exp/manipulation/removeprofile.m (modified) (2 diffs)
• src/m/exp/manipulation/removeseveralpoints.m (modified) (2 diffs)

issm/trunk/src/m/exp/expcoarsen.m

@@ -1 @@
-function expcoarsen(newfile,oldfile,resolution);
+function expcoarsen(newfile,oldfile,resolution)
 %EXPCOARSEN - coarsen an exp contour
 %

issm/trunk/src/m/exp/expcontract.m

@@ -6 +6 @@
 %
 %   See also EXPMASTER, EXPDOC
-
 
 contour=expread(oldfile);

issm/trunk/src/m/exp/expcreatecontour.m

@@ -1 @@
-function expcreatecontour(filename);
+function expcreatecontour(filename)
 %EXPCREATECONTOUR - create a contour from a list of points
 %
@@ -34 +34 @@
 %write contour using expwrite
 expwrite(a,filename);
-

issm/trunk/src/m/exp/expcreateprofile.m

@@ -1 @@
-function expcreateprofile(filename);
+function expcreateprofile(filename)
 %EXPCREATEPROFILE - create an Argus file from a list of points
 %

issm/trunk/src/m/exp/expexcludeoutliers.m

@@ -7 +7 @@
 %
 %   See also EXPMASTER, EXPDOC
-
 
 contour=expread(contourname);

issm/trunk/src/m/exp/expflip.m

@@ -5 +5 @@
 %
 %
-
-
-
-
 
 a=expread(domainname,1);

issm/trunk/src/m/exp/expll2xy.m

@@ -5 +5 @@
 %      - sgn = Sign of latitude +1 : north latitude (default is mer=45 lat=70)
 %                               -1 : south latitude (default is mer=0  lat=71)
-
 
 %Get central_meridian and standard_parallel depending on hemisphere

issm/trunk/src/m/exp/expread.m

@@ -1 @@
-function Struct=expread(filename);
+function Struct=expread(filename)
 %EXPREAD - read a file exp and build a Structure
 %

issm/trunk/src/m/exp/expswapxy.m

@@ -6 +6 @@
 %
 %   See also EXPMASTER, EXPDOC
-
 
 contours=expread(filename,1);

issm/trunk/src/m/exp/exptool.m

@@ -308 +308 @@
                         backup{counter,4}=closed;
 
-
                 case 12
 

issm/trunk/src/m/exp/expwrite.m

@@ -1 @@
-function expwrite(a,filename);
+function expwrite(a,filename)
 %EXPWRITE - write an Argus file from a structure given in input
 %
@@ -20 +20 @@
                 error('contours x and y coordinates must be of identical size');
         end
-   
+
         if isfield(a,'name'),
                 if ~isempty(a(n).name),
@@ -30 +30 @@
                 fprintf(fid,'%s\n','## Name:');
         end
-   
+
         fprintf(fid,'%s\n','## Icon:0');
         fprintf(fid,'%s\n','# Points Count Value');

issm/trunk/src/m/exp/expxy2ll.m

@@ -5 +5 @@
 %      - sgn = Sign of latitude +1 : north latitude (default is mer=45 lat=70)
 %                               -1 : south latitude (default is mer=0  lat=71)
-
 
 %Get central_meridian and standard_parallel depending on hemisphere

issm/trunk/src/m/exp/manipulation/addcontour.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=addcontour(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=addcontour(A,numprofiles,numpoints,closed,prevplot,root,options)
 %ADDCONTOUR - add a closed contour
 %
@@ -7 +7 @@
 %   Usage:
 %      [A,numprofiles,numpoints,closed]=addcontour(A,numprofiles,numpoints,closed,prevplot,root,options)
-                   
+
         title('click to add a point to the new profile, RETURN to exit','FontSize',14)
         hold on
@@ -18 +18 @@
 
                 [xi,yi] = ginput(1);
-                                          
+
                 if ~isempty(xi)
                         x(end+1,1)=xi;

issm/trunk/src/m/exp/manipulation/addendprofile.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=addendprofile(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=addendprofile(A,numprofiles,numpoints,closed,prevplot,root,options)
 %ADDENDPROFILE - add point at the end of a n existing profile
 %
@@ -7 +7 @@
 %   Usage:
 %      [A,numprofiles,numpoints,closed]=addendprofile(A,numprofiles,numpoints,closed,prevplot,root,options)
-                
+
         %some checks
         if numprofiles==0

issm/trunk/src/m/exp/manipulation/addinsideprofile.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=addinsideprofile(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=addinsideprofile(A,numprofiles,numpoints,closed,prevplot,root,options)
 %ADDINSIDEPROFILE - add apoint inside a profile
 %
@@ -7 +7 @@
 %   Usage:
 %      [A,numprofiles,numpoints,closed]=addinsideprofile(A,numprofiles,numpoints,closed,prevplot,root,options)
-                
+
         %some checks
         if numprofiles==0

issm/trunk/src/m/exp/manipulation/addprofile.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=addprofile(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=addprofile(A,numprofiles,numpoints,closed,prevplot,root,options)
 %ADDPROFILE - add a profile
 %
@@ -7 +7 @@
 %   Usage:
 %      [A,numprofiles,numpoints,closed]=addprofile(A,numprofiles,numpoints,closed,prevplot,root,options)
-                   
+
         title('click to add a point to the new profile, RETURN to exit','FontSize',14)
         hold on
@@ -18 +18 @@
 
                 [xi,yi] = ginput(1);
-                                          
+
                 if ~isempty(xi)
                         x(end+1,1)=xi;

issm/trunk/src/m/exp/manipulation/closeprofile.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=closeprofile(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=closeprofile(A,numprofiles,numpoints,closed,prevplot,root,options)
 %CLOSEPROFILE - close one or several profile
 %
@@ -13 +13 @@
                 return
         end
-                   
+
         title('click on the profiles to be closed, RETURN to exit','FontSize',14)
         hold on
@@ -33 +33 @@
 
                 [xi,yi] = ginput(1);
-                                          
+
                 if ~isempty(xi)
 

issm/trunk/src/m/exp/manipulation/cutarea.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=cutarea(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=cutarea(A,numprofiles,numpoints,closed,prevplot,root,options)
 %CUTAREA - cut several point of a profile
 %
@@ -10 +10 @@
 %   Usage:
 %      [A,numprofiles,numpoints,closed]=cutarea(A,numprofiles,numpoints,closed,prevplot,root,options)
-                
+
         hold on
         loop=1;

issm/trunk/src/m/exp/manipulation/cutprofile.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=cutprofile(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=cutprofile(A,numprofiles,numpoints,closed,prevplot,root,options)
 %CUTPROFILE - cut a profile
 %
@@ -7 +7 @@
 %   Usage:
 %      [A,numprofiles,numpoints,closed]=cutprofile(A,numprofiles,numpoints,closed,prevplot,root,options)
-                
+
         %some checks
         if numprofiles==0

issm/trunk/src/m/exp/manipulation/mergeprofiles.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=mergeprofiles(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=mergeprofiles(A,numprofiles,numpoints,closed,prevplot,root,options)
 %MERGEPROFILES - merge profiles
 %

issm/trunk/src/m/exp/manipulation/modifyposition.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=modifyposition(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=modifyposition(A,numprofiles,numpoints,closed,prevplot,root,options)
 %MODIFYPOSITION - modify the prosition of a point of a profile
 %
@@ -7 +7 @@
 %   Usage:
 %      [A,numprofiles,numpoints,closed]=modifyposition(A,numprofiles,numpoints,closed,prevplot,root,options)
-                
+
         %some checks
         if numprofiles==0

issm/trunk/src/m/exp/manipulation/orientprofile.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=orientprofile(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=orientprofile(A,numprofiles,numpoints,closed,prevplot,root,options)
 %ORIENTPROFILE - cahnge profile orientation
 %
@@ -21 +21 @@
                         return
                 end
-                   
+
                 [xi,yi] = ginput(1);
-                                          
+
                 if ~isempty(xi)
 

issm/trunk/src/m/exp/manipulation/removepoints.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=removepoints(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=removepoints(A,numprofiles,numpoints,closed,prevplot,root,options)
 %REMOVEPOINTS - remove a point from a profile
 %
@@ -7 +7 @@
 %   Usage:
 %      [A,numprofiles,numpoints,closed]=removepoints(A,numprofiles,numpoints,closed,prevplot,root,options)
-                
+
         %some checks
         if numprofiles==0

issm/trunk/src/m/exp/manipulation/removeprofile.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=removeprofile(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=removeprofile(A,numprofiles,numpoints,closed,prevplot,root,options)
 %REMOVEPROFILE - delete a profile
 %
@@ -21 +21 @@
                         return
                 end
-                   
+
                 [xi,yi] = ginput(1);
-                                          
+
                 if ~isempty(xi)
 

issm/trunk/src/m/exp/manipulation/removeseveralpoints.m

@@ -1 @@
-function [A,numprofiles,numpoints,closed]=removeseveralpoints(A,numprofiles,numpoints,closed,prevplot,root,options);
+function [A,numprofiles,numpoints,closed]=removeseveralpoints(A,numprofiles,numpoints,closed,prevplot,root,options)
 %REMOVESEVERALPOINTS - remove several point
 %
@@ -7 +7 @@
 %   Usage:
 %      [A,numprofiles,numpoints,closed]=removeseveralpoints(A,numprofiles,numpoints,closed,prevplot,root,options)
-                
+
         %some checks
         if numprofiles==0