Changeset 158 for trunk/src/proj_field.m

Timestamp:

Dec 22, 2010, 5:12:31 PM (13 years ago)

Author:

sommeria

Message:

CoordType? not used, replaced by CoordUnit?
bug repair in check_field_structure

File:

• trunk/src/proj_field.m (modified) (13 diffs)

trunk/src/proj_field.m

@@ -87 +87 @@
 end
 %introduce default field properties (reading old standards)
-if ~isfield(ObjectData,'Style')||~isfield(ObjectData,'Coord')||~isfield(ObjectData,'ProjMode')
+if ~isfield(ObjectData,'Style')||~isfield(ObjectData,'ProjMode')
     ProjData=FieldData;
     return
 end
-
+if ~isfield(ObjectData,'Coord')
+    if strcmp(ObjectData.Style,'plane')
+        ObjectData.Coord=[0 0 0];%default
+    else
+        ProjData=FieldData;
+        return
+    end
+end
+        
 % OBSOLETE
 if isfield(ObjectData,'XMax') && ~isempty(ObjectData.XMax)
@@ -112 +120 @@
 end
 %%%%%%%%%%
-
-% FieldData=document_field(FieldData);%transform FieldData to the standard format
-% if ~isfield(FieldData,'VarAttribute')
-%     FieldData.VarAttribute={};
-% end
 switch ObjectData.Style
     case 'points'
@@ -138 +141 @@
         [ProjData,errormsg] = proj_volume(FieldData,ObjectData);
 end
-% if exist('IndexObj','var')
-%     ProjData.IndexObj=IndexObj;%transfer object index
-% end
+
 
 %-----------------------------------------------------------------
@@ -1004 +1005 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%group the variables (fields of 'FieldData') in cells of variables with the same dimensions
+%% group the variables (fields of 'FieldData') in cells of variables with the same dimensions
 %-----------------------------------------------------------------
 idimvar=0;
@@ -1012 +1013 @@
     return
 end
-%LOOP ON GROUPS OF VARIABLES SHARING THE SAME DIMENSIONS
+
+% LOOP ON GROUPS OF VARIABLES SHARING THE SAME DIMENSIONS
 % CellVarIndex=cells of variable index arrays
 ivar_new=0; % index of the current variable in the projected field
@@ -1036 +1038 @@
     ivar_FF=VarType.errorflag;
     testX=~isempty(ivar_X) && ~isempty(ivar_Y);
-    %DimIndices=FieldData.VarDimIndex{VarIndex(1)};%indices of the dimensions of the first variable (common to all variables in the cell)
     DimCell=FieldData.VarDimName{VarIndex(1)};
     if ischar(DimCell)
@@ -1042 +1043 @@
     end
 
-%case of input fields with unstructured coordinates
+%% case of input fields with unstructured coordinates
     if testX
         XName=FieldData.ListVarName{ivar_X};
@@ -1066 +1067 @@
             indcut=find(abs(fieldZ) <= width);
             for ivar=VarIndex
-                 VarName=FieldData.ListVarName{ivar};
-%                 eval(['size(FieldData.' VarName ')'])
-                eval(['FieldData.' VarName '=FieldData.' VarName '(indcut);'])
-%                 end      
+                VarName=FieldData.ListVarName{ivar};
+                eval(['FieldData.' VarName '=FieldData.' VarName '(indcut);'])  
                     % A VOIR : CAS DE VAR STRUCTUREE MAIS PAS GRILLE REGULIERE : INTERPOLER SUR GRILLE REGULIERE              
             end
@@ -1217 +1216 @@
             end
         end
-%case of input fields defined on a structured  grid 
+        
+%% case of input fields defined on a structured  grid 
     else  
         AYName=FieldData.ListVarName{VarType.coord(1)};%name of input x coordinate (name preserved on projection)
@@ -1256 +1256 @@
                     DCoord_max=max(DCoord);
                 %    test_direct(idim)=DCoord_max>0;% =1 for increasing values, 0 otherwise
-                    if ~isequal(DCoord_max,DCoord_min(idim)>0)
+                    if abs(DCoord_max-DCoord_min(idim))>abs(DCoord_max/1000) 
                         msgbox_uvmat('ERROR',['non monotonic dimension variable # ' num2str(idim)  ' in proj_field.m'])
                                 return
@@ -1367 +1367 @@
                 ProjData.ListVarName=[ProjData.ListVarName VarName];
                 ProjData.VarDimName=[ProjData.VarDimName {DimCell}];
-                if length(FieldData.VarAttribute)>=ivar
+                if isfield(FieldData,'VarAttribute') && length(FieldData.VarAttribute)>=ivar
                     ProjData.VarAttribute{length(ProjData.ListVarName)}=FieldData.VarAttribute{ivar};
                 end
                 eval(['ProjData.' VarName '=FieldData.' VarName '(min_ind1:max_ind1,min_ind2:max_ind2) ;']);
-            end         
+            end  
+            eval(['ProjData.' AYName '=FieldData.' AYName ';']) %record the new (projected ) y coordinates
+            eval(['ProjData.' AXName '=FieldData.' AXName ';']) %record the new (projected ) x coordinates
         else       % case with rotation and/or interpolation
             if isempty(Coord_z) %2D case
@@ -1452 +1454 @@
         end
     end
-    %projection of  velocity components in the rotated coordinates
+    
+    %% projection of  velocity components in the rotated coordinates
     if ~isequal(Phi,0) && length(ivar_U)==1
         if isempty(ivar_V)
@@ -2082 +2085 @@
     end
 end
-if isfield(FieldData,'CoordType')
-    if isfield(ObjectData,'CoordType')&~isequal(FieldData.CoordType,ObjectData.CoordType)
-        errormsg=[ObjectData.Style ' in ' ObjectData.CoordType ' coordinates, while field in ' FieldData.CoordType ' coordinates'];
+if isfield(FieldData,'CoordUnit')
+    if isfield(ObjectData,'CoordUnit')&~isequal(FieldData.CoordUnit,ObjectData.CoordUnit)
+        errormsg=[ObjectData.Style ' in ' ObjectData.CoordUnit ' coordinates, while field in ' FieldData.CoordUnit ];
         return
     else
-         ProjData.CoordType=FieldData.CoordType;
+         ProjData.CoordUnit=FieldData.CoordUnit;
     end
 end