Changeset 21780

Timestamp:

07/13/17 14:15:05 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some exp changes, check on NaNs, change header of expcoarsen for nargin=2, figure copy is a default again

Location:

issm/trunk-jpl/src/m/exp

Files:

• expcoarsen.m (modified) (3 diffs)
• expread.m (modified) (2 diffs)
• exptool.m (modified) (1 diff)

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

@@ -1 @@
-function expcoarsen(newfile,oldfile,resolution)
+function expcoarsen(newfile,varargin)
 %EXPCOARSEN - coarsen an exp contour
 %
@@ -7 +7 @@
 %   Usage:
 %      expcoarsen(newfile,oldfile,resolution)
+%      expcoarsen(file,resolution)
 %
 %   Example:
@@ -12 +13 @@
 
 %Some checks
-if nargin~=3 | nargout
-        error('expcoarsen usage: expcoarsen(newfile,oldfile,resolution)')
-elseif ~exist(oldfile)
-        error(['expcut error message: the file ' oldfile ' does not exist'])
+if nargin==2,
+        resolution = varargin{1};
+        oldfile= newfile;
+elseif nargin==3,
+        oldfile = varargin{1};
+        resolution = varargin{2};
+else
+        error('bad usage');
+end
+
+if ~exist(oldfile)
+        error(['expcoarsen error message: file ''' oldfile ''' does not exist'])
 elseif exist(newfile),
         choice=input(['A file ' newfile ' already exists, do you want to modify it? (y/n)'],'s');

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

@@ -65 +65 @@
         Struct(count).x=A(1,:)';
         Struct(count).y=A(2,:)';
+        if any(isnan(A))
+                warning('NaNs found in coordinates, note that some tools like exptool will not work properly with NaNs');
+        end
 
         if(Struct(count).nods~=length(Struct(count).x))error(['Profile ' num2str(count) ' reports incorrect length']); end;
@@ -78 +81 @@
 end
 
+
 %close file
 fclose(fid);

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

@@ -99 +99 @@
 
 %get current figure
-nofigurecopy=getfieldvalue(options,'nofigurecopy',1);
+nofigurecopy=getfieldvalue(options,'nofigurecopy',0);
 if ~nofigurecopy,
         if ~isempty(get(0,'children')),%if there is already a figure (return the number of opened figures)