Changeset 174 for trunk/src/proj_field.m

Timestamp:

Jan 5, 2011, 9:43:28 AM (14 years ago)

Author:

sommeria

Message:

civ.m : clarification of .cmx : creation of .civ1.cmx and .civ2.cmx
uvmat: reading and projecting volume images (not yet successfull)

File:

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

trunk/src/proj_field.m

@@ -918 +918 @@
 %-----------------------------------------------------------------
 
-%initialisation of the input parameters of the projection plane
-%-----------------------------------------------------------------
+%% initialisation of the input parameters of the projection plane
 ProjMode='projection';%direct projection by default
 if isfield(ObjectData,'ProjMode'),ProjMode=ObjectData.ProjMode; end;
@@ -948 +947 @@
 NormVec_Y=cos(Phi)*sin(Theta);
 NormVec_Z=cos(Theta);
-
-% test for 3D fields
-test3D=0;
-if isfield(FieldData,'nb_dim')
-    test3D=isequal(FieldData.nb_dim,3);
-end
-test3C=test3D; %default 3 vel components
 
 %mesh sizes DX and DY
@@ -1248 +1240 @@
         Coord_y=[];
         Coord_x=[];   
-        nb_dim=numel(size(DimValue));
+        nb_dim=numel(DimValue);
         for idim=1:nb_dim %loop on space dimensions
             test_interp(idim)=0;%test for coordiate interpolation (non regular grid), =0 by default
@@ -1296 +1288 @@
         if nb_dim==3
             DZ=abs(DCoord_min(1));
-            Coord_z=linspace(Coord{1}(1),Coord{1}(end),npz);
+            Coord_z=linspace(Coord{1}(1),Coord{1}(end),DimValue(1));
             test_direct_z=test_direct(1);
         end  
@@ -1342 +1334 @@
         % case with no rotation and interpolation
         if isequal(ProjMode,'projection') && isequal(Phi,0) && isequal(Theta,0) && isequal(Psi,0)
-            if ~testXMin && ~testXMax && ~testYMin && ~testYMax
+            if ~testXMin && ~testXMax && ~testYMin && ~testYMax && nb_dim==2
                 ProjData=FieldData; 
             else
@@ -1367 +1359 @@
                     Xbound(1)=Coord{2}(1)+DXinit*(min_ind2-1);
                 end 
+                if nb_dim==3 %TODO: to update 
+                    min_ind3=ceil((Coord{1}(1)-ZMax)/DZinit)+1;
+                    max_ind2=floor((Coord{1}(2)-XMin)/DZinit)+1;
+                    Zbound(2)=Coord{1}(1)+DXinit*(max_ind2-1);
+                    Zbound(1)=Coord{1}(1)+DXinit*(min_ind2-1);
+                end
                 min_ind1=max(min_ind1,1);% deals with margin (bound lower than the first index)
                 min_ind2=max(min_ind2,1);