Changeset 516 for trunk/src/read_civdata.m

Timestamp:

Aug 16, 2012, 8:47:11 AM (13 years ago)

Author:

sommeria

Message:

various bug corrections

File:

• trunk/src/read_civdata.m (modified) (3 diffs)

trunk/src/read_civdata.m

@@ -64 +64 @@
 errormsg='';
 if ischar(FieldNames), FieldNames={FieldNames}; end;
-FieldRequest='vec';
+FieldRequest='';
 for ilist=1:length(FieldNames)
     if ~isempty(FieldNames{ilist})
         switch FieldNames{ilist}
             case{'U','V','norm(U,V)'}
-                FieldRequest='interp';
+                FieldRequest='interp_lin';
             case {'curl(U,V)','div(U,V)','strain(U,V)'}
-                FieldRequest='derivatives';
+                FieldRequest='interp_tps';
         end
     end
@@ -128 +128 @@
     Field.VarAttribute{ivar_U}.VarIndex_tps=ivar_U_tps;
 end
-% if strcmp(FieldRequest,'derivatives')% fields will be calculated from the tps
-%     Field.VarAttribute{ivar_U_tps}.FieldRequest=FieldRequest;
-%     Field.VarAttribute{ivar_U_tps}.Operation=FieldNames;
-% else% fields will be calculated from the initial fields
-%     Field.VarAttribute{ivar_U}.FieldRequest=FieldRequest;%
-%     Field.VarAttribute{ivar_U}.Operation=FieldNames;
-% end
 
 Field.ListGlobalAttribute=[Field.ListGlobalAttribute {'NbCoord','NbDim','TimeUnit','CoordUnit'}];
@@ -211 +204 @@
        % units={'pixel','pixel','pixel','pixel','pixel','pixel','','','','pixel','pixel','pixel','pixel','pixel',''};
 end
-if ~strcmp(FieldRequest,'derivatives')
+if ~strcmp(FieldRequest,'interp_tps')
     var=var(:,1:9);%suppress tps if not needed
 end