Changeset 158 for trunk/src/check_field_structure.m

Timestamp:

Dec 22, 2010, 5:12:31 PM (13 years ago)

Author:

sommeria

Message:

CoordType? not used, replaced by CoordUnit?
bug repair in check_field_structure

File:

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

trunk/src/check_field_structure.m

@@ -50 +50 @@
 nbdim=0;
 Data.ListDimName={};
+
+%% main loop on the list of variables
 for ivar=1:nbfield
     VarName=Data.ListVarName{ivar};
@@ -64 +66 @@
         return
     end
-    nbcoord=numel(sizvar);%nbre of coordiantes for variable named VarName
+    nbcoord=numel(sizvar);%nbre of coordinates for variable named VarName
+    testrange=0;
     if numel(DimCell)==0
         errormsg=['empty declared dimension .VarDimName{' num2str(ivar) '} for ' VarName];
@@ -79 +82 @@
                 return
             end
+            if sizvar(1)==2 && isequal(VarName,DimCell{1})
+                testrange=1;% test for a dimension variable representing a range 
+            end
         else
             errormsg=['1 dimension declared in .VarDimName{' num2str(ivar) '} inconsistent with the nbre of dimensions =' num2str(nbcoord) ' of the variable ' VarName];
@@ -85 +91 @@
     else
         if numel(DimCell)>nbcoord
-            DimCell=DimCell(end-nbcoord+1:end);%first singleton diemnsions omitted,
+            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];
@@ -97 +103 @@
         if isempty(iprev)% append the dimension name to the current list
             nbdim=nbdim+1;
+            RangeTest(nbdim)=0; %default
             if sizvar(idim)==2 && strcmp(DimName,VarName)%case of a coordinate defined by the two end values (regular spacing)
                 RangeTest(nbdim)=1; %to be updated for a later variable  
@@ -105 +112 @@
         else % DimName is detected in the current list of dimension names
             if ~isequal(Data.DimValue(iprev),sizvar(idim))
+                        RangeTest(iprev)
+            Data.DimValue(iprev)
                 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
-                else
+                elseif ~testrange                
                     errormsg=['dimension declaration inconsistent with the size =[' num2str(sizvar) '] for ' VarName];
                     return