Changeset 581 for trunk/src/civ_matlab.m
- Timestamp:
- Mar 12, 2013, 12:52:13 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/civ_matlab.m
r578 r581 165 165 166 166 Data.ListGlobalAttribute=[Data.ListGlobalAttribute {'Patch1_Rho','Patch1_Threshold','Patch1_SubDomain'}]; 167 Data.Patch1_ Rho=Param.Patch1.FieldSmooth;168 Data.Patch1_ Threshold=Param.Patch1.MaxDiff;169 Data.Patch1_SubDomain =Param.Patch1.SubdomainSize;167 Data.Patch1_FieldSmooth=Param.Patch1.FieldSmooth; 168 Data.Patch1_MaxDiff=Param.Patch1.MaxDiff; 169 Data.Patch1_SubDomainSize=Param.Patch1.SubDomainSize; 170 170 nbvar=length(Data.ListVarName); 171 171 Data.ListVarName=[Data.ListVarName {'Civ1_U_smooth','Civ1_V_smooth','Civ1_SubRange','Civ1_NbSites','Civ1_Coord_tps','Civ1_U_tps','Civ1_V_tps'}]; … … 185 185 end 186 186 [Data.Civ1_SubRange,Data.Civ1_NbSites,Data.Civ1_Coord_tps,Data.Civ1_U_tps,Data.Civ1_V_tps,tild,Ures, Vres,tild,FFres]=... 187 filter_tps([Data.Civ1_X(ind_good) Data.Civ1_Y(ind_good)],Data.Civ1_U(ind_good),Data.Civ1_V(ind_good),[],Data.Patch1_SubDomain ,Data.Patch1_Rho,Data.Patch1_Threshold);187 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); 188 188 Data.Civ1_U_smooth(ind_good)=Ures; 189 189 Data.Civ1_V_smooth(ind_good)=Vres; … … 373 373 if isfield (Param,'Patch2') 374 374 Data.ListGlobalAttribute=[Data.ListGlobalAttribute {'Patch2_Rho','Patch2_Threshold','Patch2_SubDomain'}]; 375 Data.Patch2_ Rho=Param.Patch2.FieldSmooth;376 Data.Patch2_ Threshold=Param.Patch2.MaxDiff;377 Data.Patch2_SubDomain =Param.Patch2.SubdomainSize;375 Data.Patch2_FieldSmooth=Param.Patch2.FieldSmooth; 376 Data.Patch2_MaxDiff=Param.Patch2.MaxDiff; 377 Data.Patch2_SubDomainSize=Param.Patch2.SubdomainSize; 378 378 nbvar=length(Data.ListVarName); 379 379 Data.ListVarName=[Data.ListVarName {'Civ2_U_smooth','Civ2_V_smooth','Civ2_SubRange','Civ2_NbSites','Civ2_Coord_tps','Civ2_U_tps','Civ2_V_tps'}]; … … 394 394 end 395 395 [Data.Civ2_SubRange,Data.Civ2_NbSites,Data.Civ2_Coord_tps,Data.Civ2_U_tps,Data.Civ2_V_tps,tild,Ures, Vres,tild,FFres]=... 396 filter_tps([Data.Civ2_X(ind_good) Data.Civ2_Y(ind_good)],Data.Civ2_U(ind_good),Data.Civ2_V(ind_good),[],Data.Patch2_SubDomain ,Data.Patch2_Rho,Data.Patch2_Threshold);396 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); 397 397 Data.Civ2_U_smooth(ind_good)=Ures; 398 398 Data.Civ2_V_smooth(ind_good)=Vres;
Note: See TracChangeset
for help on using the changeset viewer.