Changeset 1098 for trunk/src/proj_field.m

Timestamp:

Apr 13, 2021, 7:19:35 PM (3 years ago)

Author:

sommeria

Message:

various bugs repaired

File:

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

trunk/src/proj_field.m

@@ -817 +817 @@
                     ObjectData.Coord(1,3)=0;
                 end
-                dline=ObjectData.Coord(2,:)-ObjectData.Coord(1,:); 
+                dline=ObjectData.Coord(2,:)-ObjectData.Coord(1,:);
                 linelength=norm(dline);
                 if isfield(FieldData,'RangeX')
@@ -825 +825 @@
                 end
                 ProjData.(AXName)=XMin:ObjectData.DX:XMin+linelength;%abscissa of the projected data along the line
-               
+                
                 XI_proj=ObjectData.Coord(1,1)*ones(size(ProjData.(AXName)));
                 YI_proj=ObjectData.Coord(1,2)*ones(size(ProjData.(AXName)));
@@ -839 +839 @@
                 end
                 for ivar=VarIndex
-                                      VarName=FieldData.ListVarName{ivar};
+                    VarName=FieldData.ListVarName{ivar};
                     %                         ListVarName=[ListVarName VarName];
                     %                         VarDimName=[VarDimName {{'coord_y','coord_x'}}];
@@ -852 +852 @@
                     ProjData.(VarName)=interp3(Coord{3},Coord{2},Coord{1},double(FieldData.(VarName)),XI_proj,YI_proj,ZI_proj,'*linear');
                     ProjData.(VarName)=squeeze(ProjData.(VarName));
-                end            
-            
+                end
+                
             else
                 AYName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(end-1)};
@@ -895 +895 @@
                 dliny=ObjectData.Coord(2,2)-ObjectData.Coord(1,2);
                 linelength=sqrt(dlinx*dlinx+dliny*dliny);
-                theta=angle(dlinx+i*dliny);%angle of the line
+                theta=angle(dlinx+1i*dliny);%angle of the line
                 if isfield(FieldData,'RangeX')
                     XMin=min(FieldData.RangeX);%shift of the origin on the line
@@ -923 +923 @@
                 else
                     errormsg='multicomponent field not projected';
-                    display(errormsg)
                     return
                 end
@@ -931 +930 @@
                 ProjData.VarAttribute{nbvar}.Role='coord_x';
                 for ivar=VarIndex
-                    %VarName{ivar}=FieldData.ListVarName{ivar};
                     if test_interp2% interpolate on new grid
                         FieldData.(FieldData.ListVarName{ivar})=interp2(FieldData.(AXName),FieldData.(AYName),FieldData.(FieldData.ListVarName{ivar}),AXI,AYI');
@@ -969 +967 @@
                     ProjData.VarDimName{end}={AXName,'rgb'};
                 end
-    end
-    
-end
-% for vector fields, take the components longitudinal and tranverse to the projection line
-if ~isempty(ivar_U) && ~isempty(ivar_V)
-    vector_x =ProjData.(ProjData.ListVarName{ivar_U});
-    ProjData.(ProjData.ListVarName{ivar_U}) =cos(theta)*vector_x+sin(theta)*ProjData.(ProjData.ListVarName{ivar_V});
-    ProjData.(ProjData.ListVarName{ivar_V}) =-sin(theta)*vector_x+cos(theta)*ProjData.(ProjData.ListVarName{ivar_V});
-end
+            end
+            
+    end
+    % for vector fields, take the components longitudinal and tranverse to the projection line
+    if ~isempty(ivar_U) && ~isempty(ivar_V)
+        vector_x =ProjData.(ProjData.ListVarName{ivar_U});
+        ProjData.(ProjData.ListVarName{ivar_U}) =cos(theta)*vector_x+sin(theta)*ProjData.(ProjData.ListVarName{ivar_V});
+        ProjData.(ProjData.ListVarName{ivar_V}) =-sin(theta)*vector_x+cos(theta)*ProjData.(ProjData.ListVarName{ivar_V});
+    end
 end