Changeset 651 for trunk/src/civ_matlab.m
- Timestamp:
- Jun 25, 2013, 12:48:10 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/civ_matlab.m
r604 r651 193 193 Data.Patch1_SubDomainSize=Param.Patch1.SubDomainSize; 194 194 nbvar=length(Data.ListVarName); 195 Data.ListVarName=[Data.ListVarName {'Civ1_U_smooth','Civ1_V_smooth','Civ1_SubRange','Civ1_NbCentre s','Civ1_Coord_tps','Civ1_U_tps','Civ1_V_tps'}];196 Data.VarDimName=[Data.VarDimName {'nb_vec_1','nb_vec_1',{'nb_coord','nb_bound s','nb_subdomain_1'},'nb_subdomain_1',...195 Data.ListVarName=[Data.ListVarName {'Civ1_U_smooth','Civ1_V_smooth','Civ1_SubRange','Civ1_NbCentre','Civ1_Coord_tps','Civ1_U_tps','Civ1_V_tps'}]; 196 Data.VarDimName=[Data.VarDimName {'nb_vec_1','nb_vec_1',{'nb_coord','nb_bound','nb_subdomain_1'},'nb_subdomain_1',... 197 197 {'nb_tps_1','nb_coord','nb_subdomain_1'},{'nb_tps_1','nb_subdomain_1'},{'nb_tps_1','nb_subdomain_1'}}]; 198 198 Data.VarAttribute{nbvar+1}.Role='vector_x'; … … 208 208 ind_good=1:numel(Data.Civ1_X); 209 209 end 210 [Data.Civ1_SubRange,Data.Civ1_NbCentre s,Data.Civ1_Coord_tps,Data.Civ1_U_tps,Data.Civ1_V_tps,tild,Ures, Vres,tild,FFres]=...210 [Data.Civ1_SubRange,Data.Civ1_NbCentre,Data.Civ1_Coord_tps,Data.Civ1_U_tps,Data.Civ1_V_tps,tild,Ures, Vres,tild,FFres]=... 211 211 filter_tps([Data.Civ1_X(ind_good) Data.Civ1_Y(ind_good)],Data.Civ1_U(ind_good),Data.Civ1_V(ind_good),[],Data.Patch1_SubDomainSize,Data.Patch1_FieldSmooth,Data.Patch1_MaxDiff); 212 212 Data.Civ1_U_smooth(ind_good)=Ures; … … 292 292 % get the guess from patch1 293 293 for isub=1:NbSubDomain 294 nbvec_sub=Data.Civ1_NbCentre s(isub);294 nbvec_sub=Data.Civ1_NbCentre(isub); 295 295 ind_sel=find(GridX>=Data.Civ1_SubRange(1,1,isub) & GridX<=Data.Civ1_SubRange(1,2,isub) & GridY>=Data.Civ1_SubRange(2,1,isub) & GridY<=Data.Civ1_SubRange(2,2,isub)); 296 296 epoints = [GridX(ind_sel) GridY(ind_sel)];% coordinates of interpolation sites … … 401 401 Data.Patch2_SubDomainSize=Param.Patch2.SubDomainSize; 402 402 nbvar=length(Data.ListVarName); 403 Data.ListVarName=[Data.ListVarName {'Civ2_U_smooth','Civ2_V_smooth','Civ2_SubRange','Civ2_NbCentre s','Civ2_Coord_tps','Civ2_U_tps','Civ2_V_tps'}];404 Data.VarDimName=[Data.VarDimName {'nb_vec_2','nb_vec_2',{'nb_coord','nb_bound s','nb_subdomain_2'},{'nb_subdomain_2'},...403 Data.ListVarName=[Data.ListVarName {'Civ2_U_smooth','Civ2_V_smooth','Civ2_SubRange','Civ2_NbCentre','Civ2_Coord_tps','Civ2_U_tps','Civ2_V_tps'}]; 404 Data.VarDimName=[Data.VarDimName {'nb_vec_2','nb_vec_2',{'nb_coord','nb_bound','nb_subdomain_2'},{'nb_subdomain_2'},... 405 405 {'nb_tps_2','nb_coord','nb_subdomain_2'},{'nb_tps_2','nb_subdomain_2'},{'nb_tps_2','nb_subdomain_2'}}]; 406 406 … … 417 417 ind_good=1:numel(Data.Civ2_X); 418 418 end 419 [Data.Civ2_SubRange,Data.Civ2_NbCentre s,Data.Civ2_Coord_tps,Data.Civ2_U_tps,Data.Civ2_V_tps,tild,Ures, Vres,tild,FFres]=...419 [Data.Civ2_SubRange,Data.Civ2_NbCentre,Data.Civ2_Coord_tps,Data.Civ2_U_tps,Data.Civ2_V_tps,tild,Ures, Vres,tild,FFres]=... 420 420 filter_tps([Data.Civ2_X(ind_good) Data.Civ2_Y(ind_good)],Data.Civ2_U(ind_good),Data.Civ2_V(ind_good),[],Data.Patch2_SubDomainSize,Data.Patch2_FieldSmooth,Data.Patch2_MaxDiff); 421 421 Data.Civ2_U_smooth(ind_good)=Ures;
Note: See TracChangeset
for help on using the changeset viewer.