Changeset 668 for trunk/src/series/check_peaklock.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/check_peaklock.m (modified) (9 diffs)

trunk/src/series/check_peaklock.m

@@ -110 +110 @@
 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
@@ -146 +146 @@
 [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
@@ -211 +211 @@
                 % 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
@@ -218 +218 @@
                 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
@@ -227 +227 @@
                             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
@@ -265 +265 @@
                         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
@@ -278 +278 @@
                     VarInit=DataOut.(VarName);
                     if isempty(errormsg) && ~isequal(VarVal,VarInit)
-                        displ_uvmat('ERROR',['time series requires constant coordinates ' VarName],checkrun)
+                        disp_uvmat('ERROR',['time series requires constant coordinates ' VarName],checkrun)
                         return
                     end
@@ -331 +331 @@
 % 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
 
@@ -340 +340 @@
     display([OutputFile ' written'])
 else
-    displ_uvmat('ERROR',['error in Series/struct2nc: ' errormsg],checkrun)
+    disp_uvmat('ERROR',['error in Series/struct2nc: ' errormsg],checkrun)
 end