Changeset 127 for trunk/src/nc2struct.m

Timestamp:

Nov 19, 2010, 10:44:24 AM (14 years ago)

Author:

sommeria

Message:

merge_proj.m: cleaning
sub_field.m: ?
dataview.m: modifs not finished
name-generator: bug repair for new nom_type
nc2struct: cleaning
uvmat: cleaning
read_civxdata: transform all variables to double
civ: bug repair for new nom_type, not finished

File:

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

trunk/src/nc2struct.m

@@ -98 +98 @@
            if ischar(valuestr) && length(valuestr)<200
                 iatt_g=iatt_g+1;
-                indstr1=regexp(keystr,'\\');%detect '\\'
-                indstr2=regexp(keystr,'\.');%detect '\.'
+                indstr1=regexp(keystr,'\\','once');%detect '\\'
+                indstr2=regexp(keystr,'\.','once');%detect '\.'
                 if isempty(indstr1) && isempty(indstr2)
                     eval(['Data.' keystr '=''' valuestr ''';'])
@@ -228 +228 @@
     %select the used dimensions
     if ~isempty(var_read) 
-%         if isfield(Data,'ListDimName') %&& isfield(Data,'DimValue')
-%         Data=rmfield(Data,'ListDimName');
-%         %Data=rmfield(Data,'DimValue');
-%         end
-%     else
-%         list_dim=1:ndims;
         dim_index=find(flag_used);
-%         list_dim=list_dim(dim_index);
         old2new=cumsum(flag_used); 
         ListDimName=ListDimName(dim_index); 
@@ -241 +234 @@
     end
     for ivar=1:length(var_read)
-        %Data.VarDimIndex{ivar}=old2new(VarDimIndex{ivar});% ENLEVER Data.VarDimIndex ulterieurement
-        %Data.VarDimName{ivar}=Data.ListDimName(Data.VarDimIndex{ivar});
         Data.VarDimName{ivar}=ListDimName(old2new(VarDimIndex{ivar}));
     end
@@ -257 +248 @@
             end
             eval(['Data.' VarName '=double(netcdf.getVar(nc,var_index(ivar)-1));'])%read the variable data
-            %eval(['siz=size(Data.' VarName ');'])
-           % if numel(siz)<=2
-            %eval(['Data.' VarName '=Data.' VarName ''';'])%read the variable data
-            %end
         end
     end