Changeset 674 for trunk/src/find_field_cells.m

Timestamp:

Aug 23, 2013, 2:56:17 PM (11 years ago)

Author:

sommeria

Message:

various bugs repaired, in particula timing

File:

• trunk/src/find_field_cells.m (modified) (5 diffs)

trunk/src/find_field_cells.m

@@ -107 +107 @@
 
 %% find scattered (unstructured) coordinates
-ivar_coord_x=find(strcmp('coord_x',Role));
-% VarDimCell=cell(numel(ivar_coord_x));
+ivar_coord_x=find(strcmp('coord_x',Role));%find variables with Role='coord_x'
 check_select=false(1,nbvar);
 check_coord=false(1,nbvar);
 CellInfo=cell(1,numel(ivar_coord_x));
 NbDim=zeros(1,numel(ivar_coord_x));
+% loop on unstructured coordinate x -> different field cells
 for icell=1:numel(ivar_coord_x)
-    DimCell=Data.VarDimName{ivar_coord_x(icell)};
-    if ischar(DimCell),DimCell={DimCell};end
+    DimCell=Data.VarDimName{ivar_coord_x(icell)};% cell of dimension names for ivar_coord_x(icell)
+    if ischar(DimCell),DimCell={DimCell};end % transform char to cell for a single dimension
+    % look for variables sharing dimension(s) with ivar_coord_x(icell)
     check_cell=zeros(numel(DimCell),nbvar);
     for idim=1:numel(DimCell)
@@ -123 +124 @@
     end
     check_cell=sum(check_cell,1)==numel(DimCell);%logical array=1 for variables belonging to the current cell
-    VarIndex=find(check_cell);
+    VarIndex=find(check_cell);% list of detected variable indices
     if ~(numel(VarIndex)==1 && numel(DimCell)==1)% exclude case of isolated coord_x variable (treated later)
         if ~(numel(VarIndex)==1 && numel(DimCell)>1)% a variable is associated to coordinate
@@ -132 +133 @@
             else
                 for idim=1:numel(DimCell)
-                 check_index= strcmp(DimCell{idim},Data.ListDimName);
-                 CellInfo{icell}.CoordSize(idim)=Data.DimValue(check_index);
+                    check_index= strcmp(DimCell{idim},Data.ListDimName);
+                    CellInfo{icell}.CoordSize(idim)=Data.DimValue(check_index);
                 end
                 CellInfo{icell}.CoordSize=prod(CellInfo{icell}.CoordSize);
@@ -291 +292 @@
 NbDim=[NbDim NewNbDim];
 CellInfo=[CellInfo NewCellInfo];
-% 
-% %% suppress empty cells
-% check_empty=cellfun(@isempty,CellInfo);
-% CellInfo(check_empty)=[];
-% NbDim(check_empty)=[];
 
 %% suppress empty cells or cells with a single coordinate variable 
@@ -308 +304 @@
 
 %% document roles of non-coordinate variables
-% ListRole={'vector_x','vector_y','vector_z','vector_x_tps','vector_y_tps','warnflag','errorflag',...
-%    'ancillary','image','color','discrete','scalar'};% except coord,coord_x,_y,_z,Coord_tps already taken, into account
 for icell=1:numel(CellInfo)
     VarIndex=CellInfo{icell}.VarIndex;