Changeset 674 for trunk/src/tps_coeff_field.m

Timestamp:

Aug 23, 2013, 2:56:17 PM (11 years ago)

Author:

sommeria

Message:

various bugs repaired, in particula timing

File:

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

trunk/src/tps_coeff_field.m

@@ -40 +40 @@
         X=DataIn.(DataIn.ListVarName{CellInfo{icell}.CoordIndex(end)});% value of x coordinate
         Y=DataIn.(DataIn.ListVarName{CellInfo{icell}.CoordIndex(end-1)});% value of x coordinate
-        check_interp_tps=false(numel(CellInfo{icell}.VarIndex),1);
+        check_interp_tps=false(numel(DataIn.ListVarName),1);
         %for ivar=1:numel(CellInfo{icell}.VarIndex)
         Index_interp=[];
@@ -52 +52 @@
             Index_interp=[Index_interp CellInfo{icell}.VarIndex_vector_y];
         end
-        for ivar=Index_interp
-            Attr=DataIn.VarAttribute{CellInfo{icell}.VarIndex(ivar)};
+        for iselect=1:numel(Index_interp)
+            Attr=DataIn.VarAttribute{Index_interp(iselect)};
             if ~isfield(Attr,'VarIndex_tps')&& (checkall || (isfield(Attr,'ProjModeRequest')&&strcmp(Attr.ProjModeRequest,'interp_tps')))
-                check_interp_tps(ivar)=1;
+                check_interp_tps(Index_interp(iselect))=1;
             end
         end
-        VarIndexInterp=CellInfo{icell}.VarIndex(check_interp_tps);% indices of variables to interpolate through tps
-        if ~isempty(VarIndexInterp)
-            ListVarInterp=DataIn.ListVarName(VarIndexInterp);
+        
+        %VarIndexInterp=CellInfo{icell}.VarIndex(check_interp_tps);% indices of variables to interpolate through tps
+        %         if ~isempty(VarIndexInterp)
+        ListVarInterp=DataIn.ListVarName(check_interp_tps);
+        VarIndexInterp=find(check_interp_tps);
+        if ~isempty(ListVarInterp)
             % exclude data points marked 'false' for interpolation
             if isfield(CellInfo{icell},'VarIndex_errorflag')
@@ -66 +69 @@
                 X=X(FF==0);
                 Y=Y(FF==0);
-                for ilist=1:numel(VarIndexInterp)
+                for ilist=1:numel(ListVarInterp)
                     DataIn.(ListVarInterp{ilist})=DataIn.(ListVarInterp{ilist})(FF==0);
                 end
@@ -74 +77 @@
                 term=['_' num2str(nbtps-1)];
             end
-            ListNewVar=cell(1,numel(VarIndexInterp)+3);
+            ListNewVar=cell(1,numel(ListVarInterp)+3);
             ListNewVar(1:3)={['SubRange' term],['NbCentre' term],['Coord_tps' term]};
-            for ilist=1:numel(VarIndexInterp)
+            for ilist=1:numel(ListVarInterp)
                 ListNewVar{ilist+3}=[ListVarInterp{ilist} '_tps' term];
             end
             nbvar=numel(DataIn.ListVarName);
             DataOut.ListVarName=[DataIn.ListVarName ListNewVar];
-            %ListNewDim={['nb_tps' term],['nb_subdomain' term]};
             DataOut.VarDimName=[DataIn.VarDimName {{'nb_coord','nb_bounds',['nb_subdomain' term]}} {['nb_subdomain' term]} ...
                 {{['nb_tps' term],'nb_coord',['nb_subdomain' term]}}];
@@ -91 +93 @@
                 DataOut.(['Coord_tps' term])(NbCentre(isub)+1:NbCentre(isub)+3,1:2,isub)=0;%matrix of zeros to complement the matrix Coord_tps (conveninent for file storage)
                 %fill=zeros(NbCoord+1,NbCoord,size(SubRange,3)); %matrix of zeros to complement the matrix Data.Civ1_Coord_tps (conveninent for file storage)
-%                 fill=zeros(NbCoord+1,NbCoord+1,NbCoord); %matrix of zeros to complement the matrix Data.Civ1_Coord_tps (conveninent for file storage)
-%                 Coord_tps=cat(1,Coord_tps,fill);
-            end         
-            for ivar=1:numel(VarIndexInterp)
+                %                 fill=zeros(NbCoord+1,NbCoord+1,NbCoord); %matrix of zeros to complement the matrix Data.Civ1_Coord_tps (conveninent for file storage)
+                %                 Coord_tps=cat(1,Coord_tps,fill);
+            end
+            for ivar=1:numel(ListVarInterp)
                 DataOut.VarDimName{nbvar+3+ivar}={['nb_tps' term],['nb_subdomain' term]};
                 DataOut.VarAttribute{nbvar+3+ivar}=DataIn.VarAttribute{CellInfo{icell}.VarIndex_vector_x};%reproduce attributes of velocity
@@ -112 +114 @@
             DataOut.(['SubRange' term])=SubRange;
             DataOut.(['NbCentre' term])=NbCentre;
-%             DataOut.(['Coord_tps' term])=Coord_tps;
+            %             DataOut.(['Coord_tps' term])=Coord_tps;
             for ilist=1:numel(VarIndexInterp)
-%                 Var_tps=zeros(size(IndSelSubDomain)+[NbCoord+1 0]);%default spline
+                %                 Var_tps=zeros(size(IndSelSubDomain)+[NbCoord+1 0]);%default spline
                 for isub=1:size(SubRange,3)
                     ind_sel=IndSelSubDomain(1:NbCentre(isub),isub);% array indices selected for the subdomain