Changeset 668 for trunk/src/series/time_series.m

Timestamp:

Jul 15, 2013, 2:50:47 PM (11 years ago)

Author:

sommeria

Message:

a few bugs corrected.
multimask introduced in merge_proj
displ_uvmat transformed into disp_uvmat

File:

• trunk/src/series/time_series.m (modified) (11 diffs)

trunk/src/series/time_series.m

@@ -104 +104 @@
 for iview=1:nbview
     if ~exist(filecell{iview,1}','file')
-        displ_uvmat('ERROR',['the first input file ' filecell{iview,1} ' does not exist'],checkrun)
+        disp_uvmat('ERROR',['the first input file ' filecell{iview,1} ' does not exist'],checkrun)
         return
     end
@@ -122 +122 @@
     diff_time=max(max(diff(time)));
     if diff_time>0
-        displ_uvmat('WARNING',['times of series differ by (max) ' num2str(diff_time)],checkrun)
+        disp_uvmat('WARNING',['times of series differ by (max) ' num2str(diff_time)],checkrun)
     end
     time=time(1,:);% choose the time data from the first sequence
@@ -140 +140 @@
 %% check the validity of  the input file types
 if ~CheckImage{1}&&~CheckNc{1}
-    displ_uvmat('ERROR',['invalid file type input ' FileType{1}],checkrun)
+    disp_uvmat('ERROR',['invalid file type input ' FileType{1}],checkrun)
     return
 end
 if nbview==2 && ~isequal(CheckImage{1},CheckImage{2})
-    displ_uvmat('ERROR','input must be two image series or two netcdf file series',checkrun)
+    disp_uvmat('ERROR','input must be two image series or two netcdf file series',checkrun)
     return
 end
@@ -182 +182 @@
 [DataOut,tild,errormsg] = read_field(filecell{1,1},FileType{1},InputFields{1},1);
 if ~isempty(errormsg)
-    displ_uvmat('ERROR',['error reading ' filecell{1,1} ': ' errormsg],checkrun)
+    disp_uvmat('ERROR',['error reading ' filecell{1,1} ': ' errormsg],checkrun)
     return
 end
@@ -278 +278 @@
             % stop program if the first field reading is in error
             if ~isempty(errormsg)
-                displ_uvmat('ERROR',['time_series / sub_field / ' errormsg],checkrun)
+                disp_uvmat('ERROR',['time_series / sub_field / ' errormsg],checkrun)
                 return
             end
@@ -285 +285 @@
             nbvar=length(Field.ListVarName);
             if nbvar==0
-                displ_uvmat('ERROR','no input variable selected',checkrun)
+                disp_uvmat('ERROR','no input variable selected',checkrun)
                 return
             end
@@ -294 +294 @@
                         var_role=Field.VarAttribute{ivar}.Role;%'role' of the variable
                         if isequal(var_role,'errorflag')
-                            displ_uvmat('ERROR','do not handle error flags in time series',checkrun)
+                            disp_uvmat('ERROR','do not handle error flags in time series',checkrun)
                             return
                         end
@@ -332 +332 @@
                     if isequal(Param.ProjObject.ProjMode,'inside')% take the average in the domain for 'inside' mode
                         if isempty(VarVal)
-                            displ_uvmat('ERROR',['empty result at frame index ' num2str(i1_series{iview}(index))],checkrun)
+                            disp_uvmat('ERROR',['empty result at frame index ' num2str(i1_series{iview}(index))],checkrun)
                             return
                         end
@@ -345 +345 @@
                 VarInit=DataOut.(VarName);
                 if isempty(errormsg) && ~isequal(VarVal,VarInit)
-                    displ_uvmat('ERROR',['time series requires constant coordinates ' VarName ': use projection mode interp'],checkrun)
+                    disp_uvmat('ERROR',['time series requires constant coordinates ' VarName ': use projection mode interp'],checkrun)
                     return
                 end
@@ -414 +414 @@
 % display nbmissing
 if ~isequal(nbmissing,0)
-    displ_uvmat('WARNING',[num2str(nbmissing) ' files skipped: missing files or bad input, see command window display'],checkrun)
+    disp_uvmat('WARNING',[num2str(nbmissing) ' files skipped: missing files or bad input, see command window display'],checkrun)
 end
 
@@ -423 +423 @@
     display([OutputFile ' written'])
 else
-    displ_uvmat('ERROR',['error in Series/struct2nc: ' errormsg],checkrun)
+    disp_uvmat('ERROR',['error in Series/struct2nc: ' errormsg],checkrun)
 end