Changeset 382 for trunk/src/check_field_structure.m

Timestamp:

Feb 6, 2012, 11:46:39 PM (12 years ago)

Author:

sommeria

Message:

several bugs corrected
function filter_tps introduced (spline thin shell)

File:

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

trunk/src/check_field_structure.m

@@ -58 +58 @@
         return
     end
-    eval(['sizvar=size(Data.' VarName ');'])% sizvar = dimension of variable
+    sizvar=size(Data.(VarName));% sizvar = dimension of variable
     DimCell=Data.VarDimName{ivar};
     if ischar(DimCell)
@@ -65 +65 @@
         errormsg=['wrong format for .VarDimName{' num2str(ivar) ' (must be the cell of dimension names of the variable ' VarName];
         return
+        
     end
     nbcoord=numel(sizvar);%nbre of coordinates for variable named VarName
@@ -91 +92 @@
     else
         if numel(DimCell)>nbcoord
-            DimCell=DimCell(end-nbcoord+1:end);%first singleton diemensions omitted,
+            sizvar(nbcoord+1:numel(DimCell))=1;% case of singleton dimensions (not seen by the function size)
+           % DimCell=DimCell(end-nbcoord+1:end)%first singleton diemensions omitted,
         elseif nbcoord > numel(DimCell)
             errormsg=['nbre of declared dimensions in .VarDimName{' num2str(ivar) '} smaller than the nbre of dimensions =' num2str(nbcoord) ' of the variable ' VarName];
@@ -98 +100 @@
     end
     DimIndex=[];
-    for idim=1:nbcoord %loop on the coordinates of variable #ivar
+    %for idim=1:nbcoord
+    for idim=1:numel(DimCell) %loop on the coordinates of variable #ivar
         DimName=DimCell{idim};
         iprev=find(strcmp(DimName,Data.ListDimName),1);%look for dimension name DimName in the current list
@@ -112 +115 @@
         else % DimName is detected in the current list of dimension names
             if ~isequal(Data.DimValue(iprev),sizvar(idim))
+                Data.DimValue(iprev)
+                sizvar(idim)
                 if isequal(Data.DimValue(iprev),2)&& RangeTest(iprev)  % the dimension has been already detected as a range [min max]
                     Data.DimValue(iprev)=sizvar(idim); %update with actual value