Changeset 527 for trunk/src/nc2struct.m

Timestamp:

Aug 20, 2012, 11:12:46 PM (12 years ago)

Author:

sommeria

Message:

various bugs corrected

File:

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

trunk/src/nc2struct.m

@@ -96 +96 @@
     
     %%  -------- read all global attributes (constants)-----------
-    att_key={};%default
-%     iatt_g=0;
     Data.ListGlobalAttribute={};%default
+    att_key=cell(1,ngatts);%default
     for iatt=1:ngatts
         keystr= netcdf.inqAttName(nc,netcdf.getConstant('NC_GLOBAL'),iatt-1);
@@ -117 +116 @@
         catch ME
             att_key{iatt}=['attr_' num2str(iatt)];
-            eval(['Data.' att_key{iatt} '=[];'])
+            Data.(att_key{iatt})=[];
         end
     end
@@ -123 +122 @@
 
     %%  -------- read dimension names-----------
-    ListDimNameNetcdf={};
-    dim_value=[];
+    ListDimNameNetcdf=cell(1,ndims);
+    dim_value=zeros(1,ndims);
     for idim=1:ndims %loop on the dimensions of the netcdf file
         [ListDimNameNetcdf{idim},dim_value(idim)] = netcdf.inqDim(nc,idim-1);%get name and value of each dimension
@@ -133 +132 @@
  
     %%  -------- read names of variables -----------
-    ListVarNameNetcdf={}; %default
-    dimids={};
-    nbatt=[];
+    ListVarNameNetcdf=cell(1,nvars); %default
+    dimids=cell(1,nvars);
+    nbatt=zeros(1,nvars);
     for ncvar=1:nvars %loop on the variables of the netcdf file
         %get name, type, dimensions and attribute numbers of each variable 
@@ -146 +145 @@
     else   %select input variables, if requested by the input ListVarName
         ind_remove=[];
-        for ivar=1:numel(ListVarName) % check redondancy
-            if ~isempty(find(strcmp(ListVarName{ivar},ListVarName(1:ivar-1))))
-                ind_remove=[ind_remove ivar];
-            end
-        end
-        if ~isempty(ind_remove)
-            ListVarName(ind_remove)=[];
-        end           
+        check_keep=ones(1,size(ListVarName,2));
+        for ivar=1:size(ListVarName,2) % check redondancy of variable names
+            if ~isempty(find(strcmp(ListVarName{1,ivar},ListVarName(1:ivar-1)), 1))
+                check_keep(ivar)=0;% the variable #ivar is already in the list
+            end
+        end
+        ListVarName=ListVarName(:,logical(check_keep));          
         sizvar=size(ListVarName);
         testmulti=(sizvar(1)>1);%test for multiple choice of variable ranked by order of priority