Changeset 89 for trunk/src/find_field_indices.m

Timestamp:

May 20, 2010, 1:48:25 AM (14 years ago)

Author:

sommeria

Message:

many bug corrections and cleaning. Activation of the BW option in uvmat. Improvement of the interaction of get_field with uvmat.

File:

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

trunk/src/find_field_indices.m

@@ -1 +1 @@
 %'find_file_indices': test field structure for input in proj_field and plot_field
-%group the variables  into 'fields' with common dimensions
-%----------------------------------------------------------------------
+%    group the variables  into 'fields' with common dimensions
+%------------------------------------------------------------------------
 % function [DimVarIndex,CellVarIndex,NbDim,VarType]=find_field_indices(Data)
 %
-%OUTPUT:
+% OUTPUT:
 % CellVaxIndex: cell whose elements are arrays of indices in the list data.ListVarName  
 %              CellvarIndex{i} represents a set of variables with the same dimensions
@@ -18 +18 @@
 %      .discrete: like scalar, but set of data points without continuity, represented as dots in a usual plot, instead of continuous lines otherwise
 %      .scalar: scalar field (default)
-%
+%      .coord: vector of indices of coordinate variables corresponding to matrix dimensions
 %   
-%INPUT:
+% INPUT:
 % Data: structure representing fields, output of check_field_structure
 %            .ListDimName: cell listing the names of the array dimensions
@@ -153 +153 @@
         return
     end
-    NbDim(icell)=0;% nbre of space dimensions 
-    if numel(VarIndex)>1
+    %NbDim(icell)=0;% nbre of space dimensions 
+    NbDim(icell)=numel(DimCell);
+    test_coord=0;
+    if numel(VarIndex)>1      
         if ~isempty(ivar_coord_z)
             NbDim(icell)=3;
+            test_coord=1;
         elseif ~isempty(ivar_coord_y)
             NbDim(icell)=2;
+            test_coord=1;
         elseif ~isempty(ivar_coord_x)
             NbDim(icell)=1;
+            test_coord=1;
         end
     end 
     % look at coordinates variables  
     coord=zeros(1,numel(DimCell));%default
-    if NbDim(icell)==0 && ~isempty(VarDimName)% no unstructured coordinate found 
+%     if NbDim(icell)==0 && ~isempty(VarDimName)% no unstructured coordinate found 
+    if  ~test_coord && ~isempty(VarDimName)
         for idim=1:numel(DimCell)   %loop on the dimensions of the variables in cell #icell
             for ivardim=1:numel(VarDimName)