Changeset 751
 Timestamp:
 Apr 24, 2014, 8:46:31 AM (10 years ago)
 Location:
 trunk/src/series
 Files:

 2 added
 2 edited
Legend:
 Unmodified
 Added
 Removed

trunk/src/series/aver_stat.m
r716 r751 97 97 NomType=Param.InputTable(:,4); 98 98 FileExt=Param.InputTable(:,5); 99 hdisp=disp_uvmat('WAITING...','checking the file series',checkrun); 99 100 [filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param); 101 if ~isempty(hdisp),delete(hdisp),end; 100 102 %%%%%%%%%%%% 101 103 % The cell array filecell is the list of input file names, while 
trunk/src/series/time_series.m
r736 r751 68 68 msgbox_uvmat('WARNING',['the first input file ' FirstFileName ' does not exist']) 69 69 elseif isequal(size(Param.InputTable,1),1) && ~isfield(Param,'ProjObject') 70 msgbox_uvmat('WARNING','a projection object needs to be introduced fortime_series')70 msgbox_uvmat('WARNING','a projection object may be needed to select points for the time_series') 71 71 end 72 72 return … … 94 94 NomType=Param.InputTable(:,4); 95 95 FileExt=Param.InputTable(:,5); 96 hdisp=disp_uvmat('WAITING...','checking the file series',checkrun); 96 97 [filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param); 98 if ~isempty(hdisp),delete(hdisp),end; 97 99 %%%%%%%%%%%% 98 100 % The cell array filecell is the list of input file names, while … … 268 270 end 269 271 270 % calculate tps coefficients if needed 271 if isfield(Param.ProjObject,'ProjMode')&& strcmp(Param.ProjObject.ProjMode,'interp_tps') 272 Field=tps_coeff_field(Field,check_proj_tps); 273 end 274 275 %field projection on an object 272 %field projection on an object 276 273 if Param.CheckObject 274 % calculate tps coefficients if needed 275 if isfield(Param.ProjObject,'ProjMode')&& strcmp(Param.ProjObject.ProjMode,'interp_tps') 276 Field=tps_coeff_field(Field,check_proj_tps); 277 end 277 278 [Field,errormsg]=proj_field(Field,Param.ProjObject); 278 279 if ~isempty(errormsg) … … 291 292 end 292 293 DataOut=Field;%default 293 DataOut.NbDim=Field.NbDim+1; %add the time dimension for plots294 % DataOut.NbDim=Field.NbDim+1; %add the time dimension for plots 294 295 nbvar=length(Field.ListVarName); 295 296 if nbvar==0 … … 310 311 eval(['DataOut=rmfield(DataOut,''' Field.ListVarName{ivar} ''');']);%remove variable 311 312 end 312 if isequal(var_role,'coord_x') isequal(var_role,'coord_y')... 313 isequal(var_role,'coord_z')isequal(var_role,'coord') 313 if strcmp(var_role,'coord_x')strcmp(var_role,'coord_y')strcmp(var_role,'coord_z')strcmp(var_role,'coord') 314 314 testsum(ivar)=1; %constant coordinates, record without time evolution 315 315 end … … 339 339 if testsum(ivar)==2% test for recorded variable 340 340 if isempty(errormsg) 341 if isequal(Param.ProjObject.ProjMode,'inside')% take the average in the domain for 'inside'mode341 if Param.CheckObject && strcmp(Param.ProjObject.ProjMode,'inside')% take the average in the domain for 'inside' projection mode 342 342 if isempty(VarVal) 343 343 disp_uvmat('ERROR',['empty result at frame index ' num2str(i1_series{iview}(index))],checkrun) … … 394 394 % add time dimension 395 395 for ivar=1:length(Field.ListVarName) 396 DimCell=Field.VarDimName(ivar); 397 if testsum(ivar)==2%variable used as time series 396 DimCell=Field.VarDimName{ivar}; 397 if ischar(DimCell),DimCell={DimCell};end 398 if testsum(ivar)==2% variable for which time series is calculated 398 399 DataOut.VarDimName{ivar}=[{'Time'} DimCell]; 399 elseif testsum(ivar)==1 400 elseif testsum(ivar)==1 % variable represneting a fixed coordinate 400 401 DataOut.VarDimName{ivar}=DimCell; 401 402 end
Note: See TracChangeset
for help on using the changeset viewer.