Changeset 527 for trunk/src/read_civxdata.m

Timestamp:

Aug 20, 2012, 11:12:46 PM (12 years ago)

Author:

sommeria

Message:

various bugs corrected

File:

• trunk/src/read_civxdata.m (modified) (8 diffs)

trunk/src/read_civxdata.m

@@ -53 +53 @@
 DataTest=nc2struct(filename,'ListGlobalAttribute','Conventions','CivStage');
 if isfield(DataTest,'Txt')
-    errormsg=['nc2struct:' DataTest.Txt]; 
+    errormsg=['nc2struct / ' DataTest.Txt]; 
     return
 elseif isequal(DataTest.Conventions,'uvmat/civdata')%test for new civ format
      [Field,VelTypeOut,errormsg]=read_civdata(filename,FieldNames,VelType,DataTest.CivStage);
-      if ~isempty(errormsg),errormsg=['read_civdata:' errormsg];end
+      if ~isempty(errormsg),errormsg=['read_civdata / ' errormsg];end
      return
 end
@@ -77 +77 @@
 [Field,vardetect,ichoice]=nc2struct(filename,var);%read the variables in the netcdf file
 if isfield(Field,'Txt')
-    errormsg=['nc2struct:' Field.Txt];
+    errormsg=['nc2struct / ' Field.Txt];
     return
 end
@@ -97 +97 @@
 if isfield(Field,'DjUi')
     Field.ListVarName{end-3}='DjUi';
-    Field.VarDimName{end-3}=[Field.VarDimName{end-3} {'nb_coord'} {'nb-coord'}];
+    Field.VarDimName{end-3}=[Field.VarDimName{end-3} {'nb_coord'} {'nb_coord'}];
     Field.ListVarName(end-2:end)=[];
     Field.VarDimName(end-2:end)=[];
@@ -186 +186 @@
 %INPUT:
 % FieldNames =cell of field names to get, which can contain the strings:
-%             'ima_cor': image correlation, vec_c or vec2_C
-%             'vort','div','strain': requires velocity derivatives DUDX...
+%             'C': image correlation, vec_c or vec2_C
+%             'curl','div','strain': requires velocity derivatives DUDX...
 %             'error': error estimate (vec_E or vec2_E)
 %             
@@ -199 +199 @@
 if ~exist('vel_type','var'),vel_type=[];end;
 if iscell(vel_type),vel_type=vel_type{1}; end;%transform cell to string if needed
-if ~exist('FieldNames','var'),FieldNames={'ima_cor'};end;%default scalar 
+if ~exist('FieldNames','var'),FieldNames={'C'};end;%default scalar 
 if ischar(FieldNames), FieldNames={FieldNames}; end;
 
@@ -205 +205 @@
 testder=0;
 for ilist=1:length(FieldNames)
-    if ~isempty(FieldNames{ilist})
-    switch FieldNames{ilist}
-        case {'vort','div','strain'}
-            testder=1;
-    end
-    end
+        testder=~isempty(regexp(FieldNames{ilist},'(^curl|^div|strain)', 'once'));%test need for derivatives
+        if testder, break;end
 end      
 if isempty(vel_type) || isequal(vel_type,'*') %undefined velocity type (civ1,civ2...)
@@ -261 +257 @@
     if ~isempty(FieldNames{ilist})
     switch FieldNames{ilist}
-        case 'ima_cor' %image correlation corresponding to a vel vector
+        case 'C' %image correlation corresponding to a vel vector
             C1='vec_C';
             C2='vec2_C';
@@ -267 +263 @@
             C1='vec_E';
             C2='vec2_E';
-        case {'vort','div','strain'}
-            testder=1;
+        otherwise
+          testder=~isempty(regexp(FieldNames{ilist},'(^curl|^div|strain)', 'once'));%test need for derivatives
     end
     end