Changeset 105 for trunk/src/read_get_field.m

Timestamp:

Jun 24, 2010, 5:28:55 PM (14 years ago)

Author:

sommeria

Message:

Bug fix

File:

• trunk/src/read_get_field.m (modified) (11 diffs)

trunk/src/read_get_field.m

@@ -248 +248 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % vectors
-% test_vec_x_dimvar=0;%default
-% test_vec_y_dimvar=0;%default
+test_vec_x_dimvar=0;%default
+test_vec_y_dimvar=0;%default
 % test_vec_z_dimvar=0;%defaul
 dimname_vec_x=[];
@@ -321 +321 @@
                 end
             end
-%             test_vec_x_dimvar=1;
+             test_vec_x_dimvar=1;
             SubVarAttribute{nbvar}.Role='dimvar';% dimension variable
         else
@@ -354 +354 @@
                 end
             end
-%             test_vec_y_dimvar=1;
+             test_vec_y_dimvar=1;
             SubVarAttribute{nbvar}.Role='dimvar';% dimension variable
         else
@@ -458 +458 @@
     VarNameA=Field.ListVarName{VarIndexA};
     DimCellA=Field.VarDimName{VarIndexA};   
-    eval(['npxy=size(SubField.' VarNameA ')'])
+    eval(['npxy=size(SubField.' VarNameA ');'])
     SingleCellA={};
     if numel(npxy) < numel(DimCellA)
@@ -489 +489 @@
         for icoord=1:numel(SingleCellA)% look for coincidence of dimension with one of the dimensions of the scalar 
             if strcmp(dimname_y,SingleCellA{icoord})% a singleton dimension
-                errormsg=['the singleton dimension ' dimname_y ' has been selected for ordiante'];
+                errormsg=['the singleton dimension ' dimname_y ' has been selected for ordinate'];
                 return
             end
@@ -517 +517 @@
     dimextra(dimA)=[]; %list of unselected dimension indices
     DimCellA=DimCellA([dimA dimextra]);
-   % eval(['SubField.' VarNameA '=permute(squeeze(SubField.' VarNameA '),[dimA dimextra]);'])TO CHECK
+    eval(['SubField.' VarNameA '=permute(squeeze(SubField.' VarNameA '),[dimA dimextra]);'])
     SubField.VarDimName{VarSubIndexA}=DimCellA;  
     %add default coord_x and/or coord_y if empty
@@ -523 +523 @@
         VarName=Field.ListVarName{field_var_index};
         DimCell=Field.VarDimName{field_var_index};    
-        eval(['npxy=size(SubField.' VarName ')'])
+        eval(['npxy=size(SubField.' VarName ');'])
         if numel(npxy) < numel(DimCell)
             DimCell=DimCell(end-numel(npxy)+1:end); %suppress the first singletons) dimensions 
@@ -579 +579 @@
     VarNameU=Field.ListVarName{VarIndexU}; % name of u component variable
     DimCellU=Field.VarDimName{VarIndexU}; % list of dimensions for u component  
-    eval(['npxy=size(SubField.' VarNameU ')']) % npxy= dimension values for the u component
+    eval(['npxy=size(SubField.' VarNameU ');']) % npxy= dimension values for the u component
     SingleCellU={};
     if numel(npxy) < numel(DimCellU)
@@ -609 +609 @@
         end
     end
-    if test_ydimvar%dim_x && dim_y && ~isempty(VarSubIndexA)
+    if test_vec_y_dimvar%dim_x && dim_y && ~isempty(VarSubIndexA)
         for icoord=1:numel(SingleCellU)% look for coincidence of dimension with one of the dimensions of the scalar 
             if strcmp(dimname_vec_y,SingleCellU{icoord})% a singleton dimension
@@ -650 +650 @@
         VarName=Field.ListVarName{field_var_index};
         DimCell=Field.VarDimName{field_var_index};    
-        eval(['npxy=size(SubField.' VarName ')'])
+        eval(['npxy=size(SubField.' VarName ');'])
         if numel(npxy) < numel(DimCell)
             DimCell=DimCell(end-numel(npxy)+1:end); %suppress the first singletons) dimensions 
@@ -722 +722 @@
         VarName=Field.ListVarName{VarIndex_y(1)};
         DimCell=Field.VarDimName{VarIndex_y(1)};    
-        eval(['npxy=size(SubField.' VarName ')'])
+        eval(['npxy=size(SubField.' VarName ');'])
         if numel(npxy) < numel(DimCell)
 %             DimCell=DimCell(end-numel(npxy)+1:end); %suppress the first singletons) dimensions 
         end
-%         ind_select=find(npxy~=1) ;%look for non singleton dimensions
-%         DimCell=DimCell(ind_select);
-%         npxy=npxy(ind_select);
         if isfield(Field,'VarAttribute') && numel(Field.VarAttribute)>=VarIndex_y(1) ...
                              && isfield(Field.VarAttribute{VarIndex_y(1)},'Coord_1')