Changeset 404 for trunk/src/check_field_structure.m

Timestamp:

Apr 30, 2012, 6:46:45 PM (12 years ago)

Author:

sommeria

Message:

various bugs corrected. nc2struct_toolbox suppressed (correspond to obsolete versions of Matlab)

File:

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

trunk/src/check_field_structure.m

@@ -4 +4 @@
 %
 % OUTPUT:
-% DataOut: structure reproducing the input structure Data, with the additional elements:
-%           with fields:
-%
-%            .ListDimName: cell listing the names of the array dimensions
-%             .DimValue: array dimension values (Matlab vector with the same length as .ListDimName
-%            .VarDimIndex: cell containing the set of dimension indices (in list .ListDimName) for each variable of .ListVarName
-%            .VarDimName: cell containing a cell of dimension names (in list .ListDimName) for each variable of .ListVarName
+% DataOut: structure reproducing the input structure Data (TODO: suppress this output)
 % errormsg: error message which is not empty when the input structure does not have the right form
 %
@@ -22 +16 @@
 
 
-function [DataOut,errormsg]=check_field_structure(Data)
+function [errormsg,ListDimName,DimValue,VarDimIndex]=check_field_structure(Data)
 DataOut=[]; %default
 errormsg=[];
@@ -45 +39 @@
     return
 end
-if isfield(Data,'DimValue')
-    Data=rmfield(Data,'DimValue');
-end
+% if isfield(Data,'DimValue')
+%     Data=rmfield(Data,'DimValue');
+% end
 nbdim=0;
-Data.ListDimName={};
+ListDimName={};
 
 %% main loop on the list of variables
@@ -103 +97 @@
     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
+        iprev=find(strcmp(DimName,ListDimName),1);%look for dimension name DimName in the current list
         if isempty(iprev)% append the dimension name to the current list
             nbdim=nbdim+1;
@@ -110 +104 @@
                 RangeTest(nbdim)=1; %to be updated for a later variable  
             end
-            Data.DimValue(nbdim)=sizvar(idim);
-            Data.ListDimName{nbdim}=DimName;
+            DimValue(nbdim)=sizvar(idim);
+            ListDimName{nbdim}=DimName;
             DimIndex=[DimIndex nbdim];
         else % DimName is detected in the current list of dimension names
-            if ~isequal(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
+            if ~isequal(DimValue(iprev),sizvar(idim))
+                if isequal(DimValue(iprev),2)&& RangeTest(iprev)  % the dimension has been already detected as a range [min max]
+                    DimValue(iprev)=sizvar(idim); %update with actual value
                 elseif ~testrange                
                     errormsg=['dimension declaration inconsistent with the size =[' num2str(sizvar) '] for ' VarName];
@@ -125 +119 @@
         end
     end
-    Data.VarDimIndex{ivar}=DimIndex;
+    VarDimIndex{ivar}=DimIndex;
 end
 DataOut=Data;