Changeset 674 for trunk/src/struct2nc.m

Timestamp:

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

Author:

sommeria

Message:

various bugs repaired, in particula timing

File:

• trunk/src/struct2nc.m (modified) (8 diffs)

trunk/src/struct2nc.m

@@ -47 +47 @@
     return
 end
-%  [Data,errormsg]=check_field_structure(Data);%check the validity of the input field structure
+%check the validity of the input field structure
 [errormsg,ListDimName,DimValue,VarDimIndex]=check_field_structure(Data);
 if ~isempty(errormsg)
@@ -139 +139 @@
 %'check_field_structure': check the validity of the field struture representation consistant with the netcdf format
 %------------------------------------------------------------------------
-% function [DataOut,errormsg]=check_field_structure(Data)
+% [errormsg,ListDimName,DimValue,VarDimIndex]=check_field_structure(Data)
 %
 % OUTPUT:
-% 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
+% ListDimName: list of dimension names (cell array of cahr strings)
+% DimValue: list of dimension values (numerical array with the same dimension as ListDimName)
+% VarDimIndex: cell array of dimension index (in the list ListDimName) for each element of Data.ListVarName
 %
 % INPUT:
@@ -179 +181 @@
     return
 end
-% if isfield(Data,'DimValue')
-%     Data=rmfield(Data,'DimValue');
-% end
 nbdim=0;
 ListDimName={};
 
 %% main loop on the list of variables
+VarDimIndex=cell(1,nbfield);
 for ivar=1:nbfield
     VarName=Data.ListVarName{ivar};
@@ -198 +198 @@
     elseif ~iscell(DimCell)
         errormsg=['wrong format for .VarDimName{' num2str(ivar) ' (must be the cell of dimension names of the variable ' VarName];
-        return
-        
+        return       
     end
     nbcoord=numel(sizvar);%nbre of coordinates for variable named VarName
@@ -209 +208 @@
         if nbcoord==2
             if sizvar(1)==1
-                nbcoord=1;
                 sizvar(1)=sizvar(2);
             elseif sizvar(2)==1
-                nbcoord=1;
             else
                 errormsg=['1 dimension declared in .VarDimName{' num2str(ivar) '} inconsistent with the nbre of dimensions =2 of the variable ' VarName];
@@ -227 +224 @@
         if numel(DimCell)>nbcoord
             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];
@@ -234 +230 @@
     end
     DimIndex=[];
-    %for idim=1:nbcoord
     for idim=1:numel(DimCell) %loop on the coordinates of variable #ivar
         DimName=DimCell{idim};
@@ -261 +256 @@
     VarDimIndex{ivar}=DimIndex;
 end
-DataOut=Data;