Ignore:
Timestamp:
Jan 21, 2015, 7:02:04 PM (6 years ago)
Author:
sommeria
Message:

bugrepair

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series/civ_series.m

    r852 r854  
    611611       
    612612         % get the guess from patch1 or patch2 (case 'iterate')
    613         if isfield (par_civ2,'iterate') && strcmp(par_civ2.iterate,'iterate')
     613        if isfield (par_civ2,'iterate') && strcmp(par_civ2.iterate,'civ3')
    614614           SubRange= Data.Civ2_SubRange;
    615615           NbCentres=Data.Civ2_NbCentres;
     
    10021002                    [vector,F(ivec)] = SUBPIX2DGAUSS (result_conv,x,y);
    10031003                end
    1004                 utable(ivec)=vector(1)*mesh+shiftx(ivec);
     1004%                 if ~isfield(par_civ,'CheckDeformation')
     1005                utable(ivec)=vector(1)*mesh+shiftx(ivec);
    10051006                vtable(ivec)=vector(2)*mesh+shifty(ivec);
     1007%                 else
     1008%                                 utable(ivec)=shiftx(ivec);% TEST TEST !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     1009%                 vtable(ivec)=shifty(ivec);
     1010%                 end
    10061011                xtable(ivec)=iref+utable(ivec)/2-0.5;% convec flow (velocity taken at the point middle from imgae 1 and 2)
    10071012                ytable(ivec)=jref+vtable(ivec)/2-0.5;% and position of pixel 1=0.5 (convention for image coordinates=0 at the edge)
Note: See TracChangeset for help on using the changeset viewer.