Changeset 399 for trunk/src/griddata_uvmat.m

Timestamp:

Apr 27, 2012, 12:28:47 PM (12 years ago)

Author:

sommeria

Message:

implementation of thin plate interpolation (proj on planes with mode 'filter'), rationalisation of variable formats in civ_matlab

File:

• trunk/src/griddata_uvmat.m (modified) (2 diffs)

trunk/src/griddata_uvmat.m

@@ -1 +1 @@
 %'griddata_uvmat': function griddata_uvmat(vec2_X,vec2_Y,vec2_U,vec_X,vec_Y,'linear')
 %adapt the input of the matlab function griddata to the appropriate version of Matlab
-function ZI = griddata_uvmat(X,Y,Z,XI,YI,rho)
-if ~exist('rho','var')|| isequal(rho,0)
+function ZI = griddata_uvmat(X,Y,Z,XI,YI)
+% if ~exist('rho','var')|| isequal(rho,0)
     txt=ver('MATLAB');
     Release=txt.Release;
@@ -13 +13 @@
         ZI=griddata(X,Y,Z,XI,YI,'linear');
     end
-else %smooth with thin plate spline
-    [ZI,Z_diff]=patch_uvmat(X,Y,Z,XI,YI,rho);
-    diff_norm=mean(Z_diff.*Z_diff)
-    ind_good=find(abs(Z_diff)<5*diff_norm);
-    nb_remove=numel(Z_diff)-numel(ind_good)
-    if nb_remove>0
-    X=X(ind_good);
-    Y=Y(ind_good);
-    Z=Z(ind_good);
-    [ZI,Z_diff]=patch_uvmat(X,Y,Z,XI,YI,rho);
-    diff_norm_new=mean(Z_diff.*Z_diff)
-    end
-end
+% else %smooth with thin plate spline
+%     [ZI,Z_diff]=patch_uvmat(X,Y,Z,XI,YI,rho);
+%     diff_norm=mean(Z_diff.*Z_diff)
+%     ind_good=find(abs(Z_diff)<5*diff_norm);
+%     nb_remove=numel(Z_diff)-numel(ind_good)
+%     if nb_remove>0
+%     X=X(ind_good);
+%     Y=Y(ind_good);
+%     Z=Z(ind_good);
+%     [ZI,Z_diff]=patch_uvmat(X,Y,Z,XI,YI,rho);
+%     diff_norm_new=mean(Z_diff.*Z_diff)
+%     end
+% end