Changeset 1091 for trunk

Timestamp:

Feb 9, 2021, 12:52:17 PM (3 years ago)

Author:

sommeria

Message:

Param.incr_slice introduced

Location:

trunk/src

Files:

• get_field.m (modified) (1 diff)
• get_file_series.m (modified) (1 diff)
• series.m (modified) (2 diffs)
• series/time_series.m (modified) (4 diffs)

trunk/src/get_field.m

@@ -631 +631 @@
 var_component=find(test_component);% list of variable indices elligible as unstructured coordinates
 var_coord=find(test_coord);% % list of variable indices elligible as gridded coordinates
-var_coord(var_coord==scalar_index)=[];
-var_component(var_component==scalar_index)=[];
+index_coord=[];
+index_component=[];
+for iscalar=1:numel(scalar_index)
+    index_component=[index_component find(var_component==scalar_index(iscalar),1)];
+    index_coord=[index_coord find(var_coord==scalar_index(iscalar),1)];
+end
+var_component(index_component)=[];
+var_coord(index_coord)=[];
 ListCoord=Field.Display.ListVarName([var_coord var_component]);
 coord_val=zeros(size(ListCoord));

trunk/src/get_file_series.m

@@ -36 +36 @@
 InputTable=Param.InputTable;
 first_i=Param.IndexRange.first_i;
-incr_i=Param.IndexRange.incr_i;
+incr_i=Param.IndexRange.incr_slice;
 last_i=Param.IndexRange.last_i;
 first_j=[];last_j=[];incr_j=1;%default

trunk/src/series.m

@@ -1903 +1903 @@
             return
         end
+        Param.IndexRange.incr_slice=incr_i;
         if isempty(Param.IndexRange.NbSlice)
             Param.IndexRange.first_i=first_i+(iprocess-1)*BlockLength*incr_i;
@@ -1912 +1913 @@
         else %multislices (then incr_i is not empty)
             Param.IndexRange.first_i= first_i+iprocess-1;
-            Param.IndexRange.incr_i=incr_i*Param.IndexRange.NbSlice;
+            Param.IndexRange.incr_slice=incr_i*Param.IndexRange.NbSlice;
         end
         for ilist=1:size(Param.InputTable,1)

trunk/src/series/time_series.m

@@ -248 +248 @@
     last_j=j1_series{1}(end);
 end
+OutputPath=fullfile(Param.OutputPath,Param.Experiment,Param.Device)
 
 %% Set field names and velocity types
@@ -305 +306 @@
     if isfield(Param,'ActionInput') && isfield(Param.ActionInput,'VarMesh')%case of histograms
         VarMesh=Param.ActionInput.VarMesh;
-    else
+    elseif isequal(Param.IndexRange.NbSlice,1)
         VarMesh=[];
         disp_uvmat('WARNING','automatic bin size for histograms, select time_series again to set the value',checkrun)
@@ -572 +573 @@
 
 %% name of result file
-OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,first_i,last_i,first_j,last_j);
+OutputFile=fullfile_uvmat(OutputPath,OutputDir,RootFile{1},FileExtOut,NomTypeOut,first_i,last_i,first_j,last_j);
 errormsg=struct2nc(OutputFile,DataOut); %save result file
 if isempty(errormsg)
@@ -581 +582 @@
 
 %% plot the time series for  (the last one in case of multislices)
-if checkrun %&& isfield(Param,'ProjObject') && strcmp(Param.ProjObject.Type,'points')
+if checkrun && isequal(Param.IndexRange.NbSlice,1)%&& isfield(Param,'ProjObject') && strcmp(Param.ProjObject.Type,'points')
     %% open the result file with uvmat (in RUN mode)
     uvmat(OutputFile)% open the last result file with uvmat
 end
-%     figure
-%     haxes=axes;
-%     plot_field(DataOut,haxes)
-%     
-%     %% display the result file using the GUI get_field
-%     hget_field=findobj(allchild(0),'name','get_field');
-%     if ~isempty(hget_field)
-%         delete(hget_field)
-%     end
-%     get_field(OutputFile,DataOut)
-% end
-
-
+
+
+