Changeset 1115 for trunk/src/series

Timestamp:

Apr 6, 2022, 8:36:16 PM (3 years ago)

Author:

sommeria

Message:

geometry calib generalised to order_4 and proj_field debugged

Location:

trunk/src/series

Files:

• civ_series.m (modified) (2 diffs)
• merge_proj.m (modified) (1 diff)
• turb_stat.m (modified) (3 diffs)

trunk/src/series/civ_series.m

@@ -628 +628 @@
             ind_good=1:numel(Data.Civ1_X);
         end
-        
+        if isempty(ind_good)
+                        disp_uvmat('ERROR','all vectors of civ1 are bad, check input parameters' ,checkrun)
+                        return
+        end
+
         % perform Patch calculation using the UVMAT fct 'filter_tps'
         [Data.Civ1_SubRange,Data.Civ1_NbCentres,Data.Civ1_Coord_tps,Data.Civ1_U_tps,Data.Civ1_V_tps,tild,Ures, Vres,tild,FFres]=...
@@ -919 +923 @@
         else
             ind_good=1:numel(Data.Civ2_X);
+        end
+                if isempty(ind_good)
+                        disp_uvmat('ERROR','all vectors of civ2 are bad, check input parameters' ,checkrun)
+                        return
         end
         [Data.Civ2_SubRange,Data.Civ2_NbCentres,Data.Civ2_Coord_tps,Data.Civ2_U_tps,Data.Civ2_V_tps,tild,Ures,Vres,tild,FFres]=...

trunk/src/series/merge_proj.m

@@ -86 +86 @@
     return
 end
-
+if 0==1
+    phys; % used to include phys when compiling is done
+end
 %%%%%%%%%%%% STANDARD PART (DO NOT EDIT) %%%%%%%%%%%%
 ParamOut=[]; %default output

trunk/src/series/turb_stat.m

@@ -204 +204 @@
 % for i_slice=1:Param.IndexRange.NbSlice
 %     i_slice
-    ind_first=Param.IndexRange.first_i
+    ind_first=Param.IndexRange.first_i;
     for index_i=ind_first:Param.IndexRange.NbSlice:Param.IndexRange.last_i
         if ~isempty(RUNHandle)&& ~strcmp(get(RUNHandle,'BusyAction'),'queue')
@@ -210 +210 @@
             break
         end
-        for index_j=Param.IndexRange.first_j:Param.IndexRange.last_j
+        for index_j=first_j:last_j
             InputFile=fullfile_uvmat(RootPath{1},SubDir{1},RootFile{1},FileExt{1},NomType{1},index_i,index_i,index_j,index_j);
             [Field,tild,errormsg] = read_field(InputFile,FileType{iview},InputFields{iview});
@@ -217 +217 @@
             
             %%%%%%%%%%%% MAIN RUNNING OPERATIONS  %%%%%%%%%%%%
-            if index_i==ind_first && index_j==Param.IndexRange.first_j %initiate the output data structure in the first field
+            if index_i==ind_first && index_j==first_j %initiate the output data structure in the first field
                 [CellInfo,NbDim,errormsg]=find_field_cells(Field);
                 YName='coord_y';%default