Changeset 890 for trunk/src/read_field.m

Timestamp:

Apr 18, 2015, 11:03:01 PM (9 years ago)

Author:

sommeria

Message:

bugs solved for reading general netcdf files

File:

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

trunk/src/read_field.m

@@ -80 +80 @@
     case 'civdata'% new format for civ results
         [Field,ParamOut.VelType,errormsg]=read_civdata(FileName,InputField,ParamIn.VelType);
-        if ~isempty(errormsg),errormsg=['read_civdata / ' errormsg];return,end
-%         if ~isempty(strcmp('C',ParamIn.FieldName))% if C image correlation is requested as field (not color visu)
-%             ScalarIndex=strcmp('C',Field.ListVarName);
-%             Field.VarAttribute{ScalarIndex}.Role='scalar';%put role as 'scalar' instead of ancillary
-%         end      
+        if ~isempty(errormsg),errormsg=['read_civdata / ' errormsg];return,end     
         ParamOut.CivStage=Field.CivStage;
     case 'civx'% old (obsolete) format for civ results
@@ -128 +124 @@
                     ProjModeRequest=[ProjModeRequest {ProjModeRequestVar}];
                     ListInputField=[ListInputField InputField(ilist)];
-                    %ListOperator=[ListOperator {[r.Operator '_U']}];
                 else
                     checkU=1;
@@ -137 +132 @@
                     ProjModeRequest=[ProjModeRequest {ProjModeRequestVar}];
                     ListInputField=[ListInputField InputField(ilist)];
-                    %ListInputField=[ListInputField {''}];
+                    
                 else
                     checkV=1;
@@ -211 +206 @@
             end
         end
+        % insert coordinates as indices in case of plots vs matrix index
+        if isfield(ParamIn,'CheckCoordIndex') && ParamIn.CheckCoordIndex
+            Field.ListVarName=[Field.ListDimName Field.ListVarName];
+            Field.VarDimName=[Field.ListDimName Field.VarDimName];
+            for idim=1:numel(Field.ListDimName)
+                CoordName=Field.ListDimName{idim};
+                Field.(CoordName)=1:Field.DimValue(idim);
+            end
+            Field.VarAttribute=[cell(1,numel(Field.ListDimName)) Field.VarAttribute]
+        end
     case 'video'
         if strcmp(class(ParamIn),'VideoReader')