Changeset 331


Ignore:
Timestamp:
Dec 11, 2011, 11:08:21 PM (9 years ago)
Author:
sommeria
Message:

further step toward civ2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ_matlab.m

    r326 r331  
    181181    isy2=iby2+2;
    182182
    183     %get the previous guess for displacement
    184    
    185     if ~check_patch1
    186         [Data,VelType]=read_civdata(ObjectName,InputField,ParamIn.VelType);%TO DEVELOP
    187     end
    188    
    189     Guess =interp_tps(Data,X,Y)
     183
    190184%         Data.Civ1_U_Diff=zeros(size(Data.Civ1_X));
    191185%         Data.Civ1_V_Diff=zeros(size(Data.Civ1_X));
     
    209203    PointCoord(:,1)=reshape(GridX,[],1);
    210204    PointCoord(:,2)=reshape(GridY,[],1);
     205
     206    Guess = tps_eval(PointCoord,[Data.Civ1_X_tps Data.Civ1_Y_tps])
     207    Shiftx=Guess*Data.Civ1_U_tps;
     208    Shifty=Guess*Data.Civ1_V_tps;
     209   
    211210    if ~isempty(par_civ2.maskname)&& ~strcmp(maskname,par_civ2.maskname)% mask exist, not already read in civ1
    212211        mask=imread(par_civ2.maskname);
     
    673672FF=zeros(length(X),1);
    674673check_empty=zeros(1,NbSubDomain);
     674SubRangx=zeros(NbSubDomain,2);%initialise the positions of subdomains
     675SubRangy=zeros(NbSubDomain,2);
    675676for isub=1:NbSubDomain
    676677    SubRangx(isub,:)=[CentreX(isub)-0.55*SizX CentreX(isub)+0.55*SizX];
Note: See TracChangeset for help on using the changeset viewer.