Changeset 944 for trunk/src

Timestamp:

May 20, 2016, 6:19:16 PM (9 years ago)

Author:

sommeria

Message:

merge_proj_polar updated

Location:

trunk/src

Files:

• find_field_cells.m (modified) (1 diff)
• series/civ_series.m (modified) (2 diffs)
• series/merge_proj_polar.m (modified) (2 diffs)
• series/merge_proj_polar_multifile.m (added)
• series/merge_proj_polar_singlefile.m (added)
• struct2nc.m (modified) (1 diff)
• transform_field/signal_spectrum.m (modified) (3 diffs)

trunk/src/find_field_cells.m

@@ -263 +263 @@
         if ~isempty(ind_dim)
             DimIndices=[DimIndices ind_dim]; %update the list of dim indices included in DimCell
-            if check_var && CoordSize(ind_dim)==2 % determine the size of the coordinate in case of coordinate definition limited to lower and upper bounds
+            if check_var & CoordSize(ind_dim)==2 % determine the size of the coordinate in case of coordinate definition limited to lower and upper bounds
                 if isvector(Data.(ListVarName{ivardim})) 
                     if numel(Data.(ListVarName{ivardim}))>2

trunk/src/series/civ_series.m

@@ -550 +550 @@
         nbvar=length(Data.ListVarName);
         Data.VarAttribute{nbvar}.Role='errorflag';
-        Data.Civ1_FF=fix(Param.ActionInput.Fix1,Data.Civ1_F,Data.Civ1_C,Data.Civ1_U,Data.Civ1_V);
+        Data.Civ1_FF=int8(fix(Param.ActionInput.Fix1,Data.Civ1_F,Data.Civ1_C,Data.Civ1_U,Data.Civ1_V));
         Data.CivStage=2;
     end
@@ -595 +595 @@
         Data.Civ1_U_smooth(ind_good)=Ures;% take the interpolated (smoothed) velocity values for good vectors, keep 0 for the others
         Data.Civ1_V_smooth(ind_good)=Vres;
-        Data.Civ1_FF(ind_good)=FFres;
+        Data.Civ1_FF(ind_good)=int8(FFres);
         disp('patch1 performed')
     end

trunk/src/series/merge_proj_polar.m

@@ -146 +146 @@
 %% define the name for result file (with path=RootPath{1})
 OutputDir=[Param.OutputSubDir Param.OutputDirExt];% subdirectory for output files
-OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},'.nc','_1',i1_series{1}(1));
-CheckOverwrite=1;%default
-if isfield(Param,'CheckOverwrite')
-    CheckOverwrite=Param.CheckOverwrite;
-end
-if ~CheckOverwrite && exist(OutputFile,'file')
-    disp(['existing output file ' OutputFile ' already exists, skip to next field'])
-    return% skip iteration if the mode overwrite is desactivated and the result file already exists
-end
+% OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},'.nc','_1',i1_series{1}(1));
+% CheckOverwrite=1;%default
+% if isfield(Param,'CheckOverwrite')
+%     CheckOverwrite=Param.CheckOverwrite;
+% end
+% if ~CheckOverwrite && exist(OutputFile,'file')
+%     disp(['existing output file ' OutputFile ' already exists, skip to next field'])
+%     return% skip iteration if the mode overwrite is desactivated and the result file already exists
+% end
 
 if ~isfield(Param,'InputFields')
     Param.InputFields.FieldName='';
 end
-
-%% prepare output file content
-%     TimeData.ListGlobalAttribute={'Conventions','Project','CoordUnit','TimeUnit','ZPos'};
-%     TimeData.Conventions='uvmat';
-%     TimeData.Project='2016_Circumpolar';
-%     TimeData.CoordUnit='cm';
-%     TimeData.TimeUnit='s';
-%     TimeData.ZPos=0;
-%     TimeData.ListVarName={'time','radius','azimuth','U','V','curl','div'};
-%     TimeData.VarDimName={'time','radius','azimuth',{'time','radius','azimuth'},{'time','radius','azimuth'}...
-%                         {'time','radius','azimuth'},{'time','radius','azimuth'}};
-%                     TimeData.VarAttribute{1}.Role='';
-%                     TimeData.VarAttribute{2}.Role='';
-%                     TimeData.VarAttribute{3}.Role='';
-%                     TimeData.VarAttribute{4}.Role='vector_x';
-%                     TimeData.VarAttribute{5}.Role='vector_y';
-%                     TimeData.VarAttribute{6}.Role='scalar';
-%                     TimeData.VarAttribute{7}.Role='scalar';
-%                     TimeData.time=nan(1,NbField);
-%                     TimeData.radius=radius_shifted;
-%                     TimeData.azimuth=azimuth_arclength;
-%                     nby=numel(radius);
-%                     nbx=numel(azimuth);
-%                     TimeData.U=nan(NbField,nby,nbx);
-%                     TimeData.V=nan(NbField,nby,nbx);
-%                     TimeData.curl=nan(NbField,nby,nbx);
-%                     TimeData.div=nan(NbField,nby,nbx);
-                    
-%     if ~isempty(timeread)
-%         MergeData.ListGlobalAttribute=[MergeData.ListGlobalAttribute {'Time'}];
-%         MergeData.Time=timeread;
-%     end
-    
-    % time unit
-%     if isfield(Data{1},'TimeUnit')
-%         TimeUnit=Data{1}.TimeUnit;
-%         for iview =2:numel(Data)
-%             if ~(isfield(Data{iview},'TimeUnit')&& isequal(Data{iview}.TimeUnit,TimeUnit))
-%                 TimeUnit=[];%TimeUnit not the same for all fields
-%             end
-%         end
-%         if ~isempty(TimeUnit)
-%             MergeData.ListGlobalAttribute=[MergeData.ListGlobalAttribute {'TimeUnit'}];
-%             MergeData.TimeUnit=TimeUnit;
-%         end
-%     end
 
 
@@ -309 +263 @@
 %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
 tstart=tic; %used to record the computing time
-
+CheckOverwrite=1;%default
+if isfield(Param,'CheckOverwrite')
+    CheckOverwrite=Param.CheckOverwrite;
+end
 
 for index=1:NbField

trunk/src/struct2nc.m

@@ -118 +118 @@
             case {'single','double'}
                 VarType='nc_float'; % store all floating reals as single
-            case {'uint8','int16','uint16','int32','uint32','int64','uint64'}
+            case {'int8','uint8','int16','uint16','int32','uint32','int64','uint64'}
                 VarType='nc_int';
             case  'logical'

trunk/src/transform_field/signal_spectrum.m

@@ -80 +80 @@
             DataOut.TransformInput.IndexRange(ilist,1:2)=str2num(answer{ilist+1});
         end
+        if DataOut.TransformInput.IndexRange(1,2)-DataOut.TransformInput.IndexRange(1,1)<DataOut.TransformInput.WindowLength
+            msgbox_uvmat('ERROR','WindowLength must be smaller than the total time index range')
+            return
+        end
+        huvmat=findobj(allchild(0),'Tag','uvmat');
+        UvData=get(huvmat,'UserData');
+        Data=UvData.PlotAxes;
+        YName=Data.ListVarName{1};
+        XName=Data.ListVarName{2};
+        yindex=DataOut.TransformInput.IndexRange(2,:);
+        y=Data.(YName)(yindex);
+        xindex=DataOut.TransformInput.IndexRange(3,:);
+        x=Data.(XName)(xindex);
+        haxes=findobj(huvmat,'Tag','PlotAxes');
+        axes(haxes);
+        hbounds=findobj(haxes,'Tag','Bounds');
+        if isempty(hbounds)
+        hbounds=rectangle('Position',[x(1) y(1) x(2)-x(1) y(2)-y(1)],'Tag','Bounds');
+        else
+            set(hbounds,'Position',[x(1) y(1) x(2)-x(1) y(2)-y(1)])
+        end
     end
     return
@@ -90 +111 @@
 
 %% get the variable to process
+if  ~isfield(DataIn,Param.TransformInput.VariableName)
+    return
+end
 Var= DataIn.(Param.TransformInput.VariableName);%variable to analyse
 if isfield(Param.TransformInput,'IndexRange')
@@ -128 +152 @@
 end
 
-%% claculate the spectrum
+%% calculate the spectrum
 specmean=0;% mean spectrum initialisation
 cospecmean=0;