Changeset 404 for trunk/src/struct2nc.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/struct2nc.m (modified) (1 diff)

trunk/src/struct2nc.m

@@ -42 +42 @@
     return
 end 
-hhh=which('netcdf.create');% look for built-in matlab netcdf library
-
-%USE OF built-in matlab netcdf library
-if ~isequal(hhh,'')
-    FilePath=fileparts(flname);
-    if ~strcmp(FilePath,'') && ~exist(FilePath,'dir')
-        errormsg=['directory ' FilePath ' needs to be created'];
-        return
-    end
-    [Data,errormsg]=check_field_structure(Data);%check the validity of the input field structure
-    if ~isempty(errormsg)
-        errormsg=['error in struct2nc:invalid input structure_' errormsg];
-        return
-    end
-    ListVarName=Data.ListVarName;
-    nc=netcdf.create(flname,'NC_CLOBBER');%,'clobber'); %create the netcdf file with name flname   
-    %write global constants
-    if isfield(Data,'ListGlobalAttribute')
-        keys=Data.ListGlobalAttribute;
-        for iattr=1:length(keys)
-            if isfield(Data,keys{iattr})
-                 testvar=0;
-                for ivar=1:length(ListVarName)% eliminate possible global attributes with the same name as a variable
-                    if isequal(ListVarName{ivar}, keys{iattr})
-                        testvar=1;
-                        break
-                    end
+FilePath=fileparts(flname);
+if ~strcmp(FilePath,'') && ~exist(FilePath,'dir')
+    errormsg=['directory ' FilePath ' needs to be created'];
+    return
+end
+%  [Data,errormsg]=check_field_structure(Data);%check the validity of the input field structure
+[errormsg,ListDimName,DimValue,VarDimIndex]=check_field_structure(Data);
+if ~isempty(errormsg)
+    errormsg=['error in struct2nc:invalid input structure_' errormsg];
+    return
+end
+ListVarName=Data.ListVarName;
+nc=netcdf.create(flname,'NC_CLOBBER');%,'clobber'); %create the netcdf file with name flname   
+%write global constants
+if isfield(Data,'ListGlobalAttribute')
+    keys=Data.ListGlobalAttribute;
+    for iattr=1:length(keys)
+        if isfield(Data,keys{iattr})
+             testvar=0;
+            for ivar=1:length(ListVarName)% eliminate possible global attributes with the same name as a variable
+                if isequal(ListVarName{ivar}, keys{iattr})
+                    testvar=1;
+                    break
                 end
-                if ~testvar               
-                    eval(['cte=Data.' keys{iattr} ';'])
-                    if (ischar(cte) ||isnumeric(cte)) &&  ~isempty(cte)%&& ~isequal(cte,'')
-                        %write constant only if it is numeric or char string, and not empty
-                        netcdf.putAtt(nc,netcdf.getConstant('NC_GLOBAL'),keys{iattr},cte)
-                    end
+            end
+            if ~testvar               
+                eval(['cte=Data.' keys{iattr} ';'])
+                if (ischar(cte) ||isnumeric(cte)) &&  ~isempty(cte)%&& ~isequal(cte,'')
+                    %write constant only if it is numeric or char string, and not empty
+                    netcdf.putAtt(nc,netcdf.getConstant('NC_GLOBAL'),keys{iattr},cte)
                 end
             end
         end
     end
-    %create dimensions
-    dimid=zeros(1,length(Data.ListDimName));
-    for idim=1:length(Data.ListDimName)
-         dimid(idim) = netcdf.defDim(nc,Data.ListDimName{idim},Data.DimValue(idim));
-    end
-    VarAttribute={}; %default
-    testattr=0;
-    if isfield(Data,'VarAttribute')
-        VarAttribute=Data.VarAttribute;
-        testattr=1;
-    end
-    varid=zeros(1,length(Data.ListVarName));
-    for ivar=1:length(ListVarName)
-        varid(ivar)=netcdf.defVar(nc,ListVarName{ivar},'nc_double',dimid(Data.VarDimIndex{ivar}));%define variable  
-    end
-     %write variable attributes
-    if testattr
-        for ivar=1:min(numel(VarAttribute),numel(ListVarName))  
-            if isstruct(VarAttribute{ivar})
-                attr_names=fields(VarAttribute{ivar});
-                for iattr=1:length(attr_names)
-                    eval(['attr_val=VarAttribute{ivar}.' attr_names{iattr} ';']);
-                    if ~isempty(attr_names{iattr})&& ~isempty(attr_val)
-                        netcdf.putAtt(nc,varid(ivar),attr_names{iattr},attr_val);
-                    end
+end
+%create dimensions
+dimid=zeros(1,length(ListDimName));
+for idim=1:length(ListDimName)
+     dimid(idim) = netcdf.defDim(nc,ListDimName{idim},DimValue(idim));
+end
+VarAttribute={}; %default
+testattr=0;
+if isfield(Data,'VarAttribute')
+    VarAttribute=Data.VarAttribute;
+    testattr=1;
+end
+varid=zeros(1,length(Data.ListVarName));
+for ivar=1:length(ListVarName)
+    varid(ivar)=netcdf.defVar(nc,ListVarName{ivar},'nc_double',dimid(VarDimIndex{ivar}));%define variable  
+end
+ %write variable attributes
+if testattr
+    for ivar=1:min(numel(VarAttribute),numel(ListVarName))  
+        if isstruct(VarAttribute{ivar})
+            attr_names=fields(VarAttribute{ivar});
+            for iattr=1:length(attr_names)
+                eval(['attr_val=VarAttribute{ivar}.' attr_names{iattr} ';']);
+                if ~isempty(attr_names{iattr})&& ~isempty(attr_val)
+                    netcdf.putAtt(nc,varid(ivar),attr_names{iattr},attr_val);
                 end
             end
         end
     end
-    netcdf.endDef(nc); %put in data mode
-    for ivar=1:length(ListVarName)
-        if isfield(Data,ListVarName{ivar})
-            VarVal=Data.(ListVarName{ivar}); 
-            %varval=values of the current variable 
-            VarDimIndex=Data.VarDimIndex{ivar}; %indices of the variable dimensions in the list of dimensions
-            VarDimName=Data.VarDimName{ivar};
-            if ischar(VarDimName)
-                VarDimName={VarDimName};
-            end
-            siz=size(VarVal);
-            testrange=(numel(VarDimName)==1 && strcmp(VarDimName{1},ListVarName{ivar}) && numel(VarVal)==2);% case of a coordinate defined on a regular mesh by the first and last values.
-            testline=isequal(length(siz),2) && isequal(siz(1),1)&& isequal(siz(2), Data.DimValue(VarDimIndex));%matlab vector
-            testcolumn=isequal(length(siz),2) && isequal(siz(1), Data.DimValue(VarDimIndex))&& isequal(siz(2),1);%matlab column vector
-%             if ~testrange && ~testline && ~testcolumn && ~isequal(siz,Data.DimValue(VarDimIndex))
+end
+netcdf.endDef(nc); %put in data mode
+for ivar=1:length(ListVarName)
+    if isfield(Data,ListVarName{ivar})
+        VarVal=Data.(ListVarName{ivar}); 
+        %varval=values of the current variable 
+%        VarDimIndex=Data.VarDimIndex{ivar}; %indices of the variable dimensions in the list of dimensions
+        VarDimName=Data.VarDimName{ivar};
+        if ischar(VarDimName)
+            VarDimName={VarDimName};
+        end
+        siz=size(VarVal);
+        testrange=(numel(VarDimName)==1 && strcmp(VarDimName{1},ListVarName{ivar}) && numel(VarVal)==2);% case of a coordinate defined on a regular mesh by the first and last values.
+        testline=isequal(length(siz),2) && isequal(siz(1),1)&& isequal(siz(2), DimValue(VarDimIndex{ivar}));%matlab vector
+        testcolumn=isequal(length(siz),2) && isequal(siz(1), DimValue(VarDimIndex{ivar}))&& isequal(siz(2),1);%matlab column vector
+%             if ~testrange && ~testline && ~testcolumn && ~isequal(siz,DimValue(VarDimIndex))
 %                 errormsg=['wrong dimensions declared for ' ListVarName{ivar} ' in struct2nc.m'];
 %                 break
 %             end 
-            if testline || testrange
-                if testrange
-                    VarVal=linspace(VarVal(1),VarVal(2),Data.DimValue(VarDimIndex));% restitute the whole array of coordinate values
-                end
-                netcdf.putVar(nc,varid(ivar), double(VarVal'));
-            else
-                netcdf.putVar(nc,varid(ivar), double(VarVal));
-            end      
-        end
+        if testline || testrange
+            if testrange
+                VarVal=linspace(VarVal(1),VarVal(2),DimValue(VarDimIndex{ivar}));% restitute the whole array of coordinate values
+            end
+            netcdf.putVar(nc,varid(ivar), double(VarVal'));
+        else
+            netcdf.putVar(nc,varid(ivar), double(VarVal));
+        end      
     end
-    netcdf.close(nc)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%OLD netcdf toolbox
-else
-    errormsg=struct2nc_toolbox(flname,Data);
 end
+netcdf.close(nc)
 
+