Changeset 317 for trunk/src/civ_matlab.m

Timestamp:

Dec 5, 2011, 7:48:37 PM (12 years ago)

Author:

sommeria

Message:

bug repaired in name2display (names in _000001) and civ.m

File:

• trunk/src/civ_matlab.m (modified) (4 diffs)

trunk/src/civ_matlab.m

@@ -79 +79 @@
 
 else
-    Data=nc2struct(ncfile,'ListGlobalAttribute','absolut_time_T0'); %look for the constant 'absolut_time_T0' to detect old civx data format 
+    Data=nc2struct(ncfile,'ListGlobalAttribute','absolut_time_T0') %look for the constant 'absolut_time_T0' to detect old civx data format 
+    if isfield(Data,'Txt')
+            errormsg=Data.Txt;
+        return
+    end
     if ~isempty(Data.absolut_time_T0')%read civx file
         check_civx=1;% test for old civx data format
@@ -90 +94 @@
         end
     end
-    if isfield(Data,'Txt')
-        msgbox_uvmat('ERROR',Data.Txt)
-        return
-    end
+
 end
 
@@ -295 +296 @@
 
 %% write result in a netcdf file if requested
-if exist('ncfile','var')
+if exist('ncfile','var') && ~(isfield(Param,'CheckOuputFile')&&Param.CheckOuputFile)
     errormsg=struct2nc(ncfile,Data);
 end
@@ -413 +414 @@
 
 %% compute image correlations: MAINLOOP on velocity vectors
-% corrmax=0;
-% sum_square=1;% default
+corrmax=0;
+sum_square=1;% default
 % vector=[0 0];%default
 for ivec=1:nbvec