Changeset 56 for trunk/src/nc2struct.m

Timestamp:

Mar 17, 2010, 1:30:15 PM (14 years ago)

Author:

sommeria

Message:

uvmat: edit vector button activated
debugging and cleaning after modifications made with the windows version

File:

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

trunk/src/nc2struct.m

@@ -3 +3 @@
 % The corresponding dimensions and variable attributes are then extracted
 %----------------------------------------------------------------------
-% function [Data,var_detect,ichoice]=nc2struct(nc,ListVarName)
+% function [Data,var_detect,ichoice]=nc2struct(nc,varargin)
 %
 % OUTPUT:
@@ -19 +19 @@
 %INPUT:
 %     nc:      name of a netcdf file (char string) or netcdf object   
-% ListVarName: optional list of variable names to select (cell array of  char strings {'VarName1', 'VarName2',...} ) 
-%         if ListVarName=[] or {}, no variables is read (only global attributes and lists of dimensions, variables and attriburtes)
+%    additional arguments:
+%         -in the absence of other arguments, all the fields are read
+%         -a cell array, ListVarName, of  char strings {'VarName1', 'VarName2',...} ) 
+%         if ListVarName=[] or {}, no variables is read (only global attributes)
 %         if ListVarName is absent, or = '*', ALL the variables are read. 
 %        if ListVarName is a cell array with n lines, the set of variables
 %                        will be sought by order of priority in the list, while output names will be set by the first line
+%        - the string 'ListGlobalAttribute' followed by a list of attribute  names: reads only these attributes (fast reading)
 % 
 %AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -42 +45 @@
    
 function [Data,var_detect,ichoice]=nc2struct(nc,varargin)
-List=varargin;
+
 if isempty(varargin)
-    List{1}='*';
+    varargin{1}='*';
 end
-% if ~exist('ListVarName','var')
-%     ListVarName='*';
-% end
 hhh=which('netcdf.open');% look for built-in matlab netcdf library
 
@@ -69 +69 @@
     end
     % short reading of global attributes
-    if isequal(List{1},'ListGlobalAttribute')
-        for ilist=2:numel(List)
+    if isequal(varargin{1},'ListGlobalAttribute')
+        for ilist=2:numel(varargin)
             try
-            valuestr = netcdf.getAtt(nc,netcdf.getConstant('NC_GLOBAL'),List{ilist});
+            valuestr = netcdf.getAtt(nc,netcdf.getConstant('NC_GLOBAL'),varargin{ilist});
             catch
                 valuestr=[];
             end
-            eval(['Data.' List{ilist} '=valuestr;'])
+            eval(['Data.' varargin{ilist} '=valuestr;'])
         end
         netcdf.close(nc)
@@ -83 +83 @@
 
     % reading of variables, including attributes
-    ListVarName=List{1};  
+    ListVarName=varargin{1};  
     [ndims,nvars,ngatts]=netcdf.inq(nc);%nbre of dimensions, variables, attributes