Changeset 331 for trunk/src

Timestamp:

Dec 11, 2011, 11:08:21 PM (13 years ago)

Author:

sommeria

Message:

further step toward civ2

File:

• trunk/src/civ_matlab.m (modified) (3 diffs)

trunk/src/civ_matlab.m

@@ -181 +181 @@
     isy2=iby2+2;
 
-    %get the previous guess for displacement
-    
-    if ~check_patch1
-        [Data,VelType]=read_civdata(ObjectName,InputField,ParamIn.VelType);%TO DEVELOP
-    end
-    
-    Guess =interp_tps(Data,X,Y)
+
 %         Data.Civ1_U_Diff=zeros(size(Data.Civ1_X));
 %         Data.Civ1_V_Diff=zeros(size(Data.Civ1_X));
@@ -209 +203 @@
     PointCoord(:,1)=reshape(GridX,[],1);
     PointCoord(:,2)=reshape(GridY,[],1);
+
+    Guess = tps_eval(PointCoord,[Data.Civ1_X_tps Data.Civ1_Y_tps])
+    Shiftx=Guess*Data.Civ1_U_tps;
+    Shifty=Guess*Data.Civ1_V_tps;
+    
     if ~isempty(par_civ2.maskname)&& ~strcmp(maskname,par_civ2.maskname)% mask exist, not already read in civ1
         mask=imread(par_civ2.maskname);
@@ -673 +672 @@
 FF=zeros(length(X),1);
 check_empty=zeros(1,NbSubDomain);
+SubRangx=zeros(NbSubDomain,2);%initialise the positions of subdomains
+SubRangy=zeros(NbSubDomain,2);
 for isub=1:NbSubDomain
     SubRangx(isub,:)=[CentreX(isub)-0.55*SizX CentreX(isub)+0.55*SizX];