Changeset 1001 for trunk/src/read_field.m

Timestamp:

Feb 27, 2017, 9:28:27 AM (7 years ago)

Author:

sommeria

Message:

tubcorrelation added, compilation improved to accept tranform fct

File:

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

trunk/src/read_field.m

@@ -152 +152 @@
             [Field,var_detect,ichoice,errormsg]=nc2struct(FileName,'TimeVarName',ParamIn.TimeVarName,num,[ParamIn.Coord_x ParamIn.Coord_y ParamIn.Coord_z ListVar]);
             if numel(num)~=1
-                NbCoord=NbCoord+1;% adds time coordinate, except if q single time hqs been selected
+                NbCoord=NbCoord+1;% adds time coordinate, except if a single time has been selected
             end
         else
@@ -160 +160 @@
             return
         end
-        %scan all the variables beyond the two first ones, ParamIn.Coord_x and ParamIn.Coord_y.
+        CheckStructured=1;
+        %scan all the variables beyond the two first NbCoord ones describing the coordinates.
         for ilist=NbCoord+1:numel(Field.VarDimName)
             if isequal(Field.VarDimName{1},Field.VarDimName{ilist}) % if a variable has the same dimension as the coordinate, it denotes a field with unstructured coordinates
@@ -168 +169 @@
                     Field.VarAttribute{3}.Role='coord_z';
                 end
+                CheckUnstructured=0;
                 break
             end
         end
+        if CheckStructured
+            for ilist=NbCoord+1:numel(Field.VarDimName)
+                rank(1)=find(strcmp(ParamIn.Coord_x,Field.VarDimName{ilist}));
+                rank(2)=find(strcmp(ParamIn.Coord_y,Field.VarDimName{ilist}));
+                if NbCoord==3
+                rank(3)=find(strcmp(ParamIn.Coord_z,Field.VarDimName{ilist}));
+                end
+                rank=flip(rank);
+                VarName=Field.ListVarName{ilist};
+                Field.(VarName)=permute(Field.(VarName),rank);
+                Field.VarDimName{ilist}=Field.VarDimName{ilist}(rank);% permute the order of dimensions
+            end
+        end             
         NormName='';
         UName='';
@@ -225 +240 @@
                 Field.VarAttribute=[cell(1,numel(Field.ListDimName)) Field.VarAttribute];
             end
+            
         end
     case 'video'