Changeset 501 for trunk/src/find_field_indices.m

Timestamp:

Jul 25, 2012, 1:41:52 AM (12 years ago)

Author:

sommeria

Message:

various improvements: read input parameters for civ. Order of panels rationalised.
rationalisation in find_field_indices
simplification of default PARAM.xml, suppress unneeded information.

File:

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

trunk/src/find_field_indices.m

@@ -117 +117 @@
 
 %% role of variables
-Role=mat2cell(blanks(nbvar),1,ones(1,nbvar));%initialize a cell array of nbvar blanks
+Role=num2cell(blanks(nbvar));%initialize a cell array of nbvar blanks
 Role=regexprep(Role,' ','scalar'); % Role set to 'scalar' by default
 if isfield(Data,'VarAttribute')
@@ -129 +129 @@
 %% loop on the list of variables, group them by common dimensions
 for ivar=1:nbvar
+    if ischar(Data.VarDimName{ivar})
+        Data.VarDimName{ivar}=Data.VarDimName(ivar);%transform char chain into cell
+    end
     DimCell=Data.VarDimName{ivar}; %dimensions associated with the variable #ivar
-    if ischar(DimCell)
-        DimCell={DimCell};
-        Data.VarDimName{ivar}={Data.VarDimName{ivar}};%transform char chain into cell
-    end
     testnewcell=1;
     for icell_prev=1:numel(CellVarIndex)%detect whether the dimensions of ivar fit with an existing cell
         PrevVarIndex=CellVarIndex{icell_prev};%list of variable indices in cell # icell_prev
-        PrevDimName=Data.VarDimName{PrevVarIndex(1)};%list of corresponding variable names
-        if isequal(PrevDimName,DimCell)
+        PrevDimCell=Data.VarDimName{PrevVarIndex(1)};%list of corresponding variable names
+        if isequal(PrevDimCell,DimCell)
             CellVarIndex{icell_prev}=[CellVarIndex{icell_prev} ivar];% add variable index #ivar to the cell #icell_prev
             testnewcell=0; %existing cell detected
@@ -146 +145 @@
     if testnewcell
         icell=icell+1;
-        CellVarIndex{icell}=ivar;%put the current variabl index in the new cell 
+        CellVarIndex{icell}=ivar;%put the current variable index in the new cell 
+        NbDim(icell)=numel(DimCell);%default
     end
    
     %look for dimension variables
-    if numel(DimCell)==1% if the variable has a single dimension 
-        if strcmp(DimCell{1},Data.ListVarName{ivar}) || strcmp(Role{ivar},'dimvar')
-            ivardim=ivardim+1;
-            VarDimIndex(ivardim)=ivar;%index of the variable
-            VarDimName{ivardim}=DimCell{1};%name of the dimension
-        end
-    end
+%     if numel(DimCell)==1% if the variable has a single dimension 
+%         if strcmp(DimCell{1},Data.ListVarName{ivar}) %|| strcmp(Role{ivar},'dimvar')
+%             ivardim=ivardim+1;
+%             VarDimIndex(ivardim)=ivar;%index of the variable
+%             VarDimName{ivardim}=DimCell{1};%name of the dimension
+%         end
+%     end
+end
+
+%% find dimension variables
+checksinglecell=cellfun(@numel,CellVarIndex)==1 & NbDim==1;% find isolated cells with a single dimension
+ind_dim_var_cell=find(checksinglecell);
+%CoordType(ind_dim_var_cell)='dim_var';% to be used in output
+for icoord=1:numel(ind_dim_var_cell)
+VarDimIndex(icoord)=CellVarIndex{ind_dim_var_cell(icoord)};
+VarDimName{icoord}=Data.VarDimName{VarDimIndex(icoord)}{1};
 end
 
@@ -162 +171 @@
 ListRole={'coord_x','coord_y','coord_z','vector_x','vector_y','vector_z','vector_x_tps','vector_y_tps','warnflag','errorflag',...
     'ancillary','image','color','discrete','scalar','coord_tps'};% rmq vector_x_tps and vector_y_tps to be replaced by vector_x and vector_y
-NbDim=zeros(size(CellVarIndex));%default
+% NbDim=zeros(size(CellVarIndex));%default
 
 for ilist=1:numel(ListRole)
@@ -171 +180 @@
     VarType.subrange_tps=[];
     VarType.nbsites_tps=[];
+    select=zeros(1,numel(VarType.coord_tps));
     for ifield=1:numel(VarType.coord_tps)
-        select(ifield)=0;
         DimCell=Data.VarDimName{VarType.coord_tps(ifield)};
         if numel(DimCell)==3
@@ -194 +203 @@
 CellVarType=cell(1,length(CellVarIndex));
 for icell=1:length(CellVarIndex)
+    if checksinglecell(icell)
+        continue
+    end
     VarIndex=CellVarIndex{icell};%set of variable indices with the same dim
     check_remove=0;
@@ -212 +224 @@
             return
         end
+        % case of x cordinate marked as a dimension variable (var name=dimension name)
+        if isempty(CellVarType{icell}.coord_x)
+            var_dim_index=find(strcmp(DimCell{1},Data.ListVarName(VarIndex)));
+            if ~isempty(var_dim_index)
+                CellVarType{icell}.coord_x=VarIndex(var_dim_index);
+            end
+        end         
         if numel(CellVarType{icell}.errorflag)>1
             errormsg='multiply defined error flag in the same cell';
@@ -239 +258 @@
         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)
-                    if strcmp(VarDimName{ivardim},DimCell{idim})
-                        coord(idim)=VarDimIndex(ivardim);
-                        break
-                    end
+                ind_coord=find(strcmp(DimCell{idim},VarDimName));
+                if ~isempty(ind_coord)
+                    coord(idim)=VarDimIndex(ind_coord);
                 end
+%                 for ivardim=1:numel(VarDimName)
+%                     if strcmp(VarDimName{ivardim},DimCell{idim})
+%                         coord(idim)=VarDimIndex(ivardim);
+%                         break
+%                     end
+%                 end
             end
             NbDim(icell)=numel(find(coord));