Changeset 530 for trunk/src/calc_tps.m

Timestamp:

Aug 27, 2012, 4:38:41 PM (13 years ago)

Author:

sommeria

Message:

new conventions for find_field_cells .

File:

• trunk/src/calc_tps.m (modified) (2 diffs)

trunk/src/calc_tps.m

@@ -5 +5 @@
     SubDomain=DataIn.SubDomain;%
 end
-[CellVarIndex,NbDimVec,VarTypeCell,errormsg]=find_field_cells(DataIn);
+%[CellVarIndex,NbDimVec,VarTypeCell,errormsg]=find_field_cells(DataIn);
+[CellInfo,NbDimArray,errormsg]=find_field_cells(DataIn);
 nbtps=0;
-for icell=1:numel(CellVarIndex);
-    VarType=VarTypeCell{icell};
-    if NbDimVec(icell)>=2 && ~isempty(VarType.coord_x)
+for icell=1:numel(CellInfo);
+    %VarType=VarTypeCell{icell};
+    if NbDimArray(icell)>=2 && strcmp(CellInfo{icell}.CoordType,'scattered')%'&& ~isempty(VarType.coord_x)
         nbtps=nbtps+1;
-        X=DataIn.(DataIn.ListVarName{VarType.coord_x});
-        Y=DataIn.(DataIn.ListVarName{VarType.coord_y});
-        if ~isempty(VarType.vector_x)&&~isempty(VarType.vector_y)
-            Attr=DataIn.VarAttribute{VarType.vector_x};
+        X=DataIn.(DataIn.ListVarName{CellInfo{icell}.CoordIndex(end)});
+        Y=DataIn.(DataIn.ListVarName{CellInfo{icell}.CoordIndex(end-1)});
+        if isfield(CellInfo{icell},'VarIndex_vector_x')&&isfield(CellInfo{icell},'VarIndex_vector_y')
+            Attr=DataIn.VarAttribute{CellInfo{icell}.VarIndex_vector_x};
             if ~isfield(Attr,'VarIndex_tps')&& (checkall || (isfield(Attr,'FieldRequest')&&strcmp(Attr.FieldRequest,'interp_tps')))               
-                U=DataIn.(DataIn.ListVarName{VarType.vector_x});
-                V=DataIn.(DataIn.ListVarName{VarType.vector_y});
+                U=DataIn.(DataIn.ListVarName{CellInfo{icell}.VarIndex_vector_x});
+                V=DataIn.(DataIn.ListVarName{CellInfo{icell}.VarIndex_vector_y});
             else
                 continue
             end
         end
-        if ~isempty(VarType.errorflag)
-            FF=DataIn.(DataIn.ListVarName{VarType.errorflag});
+        if isfield(CellInfo{icell},'VarIndex_errorflag')
+            FF=DataIn.(DataIn.ListVarName{CellInfo{icell}.VarIndex_errorflag});
             X=X(FF==0);
             Y=Y(FF==0);
@@ -47 +48 @@
         
         DataOut.VarAttribute{nbvar+3}.Role='coord_tps';
-        DataOut.VarAttribute{nbvar+4}=DataIn.VarAttribute{VarType.vector_x};%reproduce attributes of velocity
+        DataOut.VarAttribute{nbvar+4}=DataIn.VarAttribute{CellInfo{icell}.VarIndex_vector_x};%reproduce attributes of velocity
          DataOut.VarAttribute{nbvar+4}.Role='vector_x_tps';
-         DataIn.VarAttribute{VarType.vector_x}.VarIndex_tps=nbvar+4;% indicte the correspondance with initial data
-        DataOut.VarAttribute{nbvar+5}=DataIn.VarAttribute{VarType.vector_y};%reproduce attributes of velocity 
+         DataIn.VarAttribute{CellInfo{icell}.VarIndex_vector_x}.VarIndex_tps=nbvar+4;% indicte the correspondance with initial data
+        DataOut.VarAttribute{nbvar+5}=DataIn.VarAttribute{CellInfo{icell}.VarIndex_vector_y};%reproduce attributes of velocity 
          DataOut.VarAttribute{nbvar+5}.Role='vector_y_tps';
         if isfield(DataOut,'ListDimName')%cleaning'