Changeset 1117 for trunk

Timestamp:

Jun 2, 2022, 11:34:28 AM (3 years ago)

Author:

sommeria

Message:

civ3 reading introduced

Location:

trunk/src

Files:

• read_civdata.m (modified) (1 diff)
• uvmat.m (modified) (1 diff)

trunk/src/read_civdata.m

@@ -222 +222 @@
 var={};
 switch vel_type
-    case 'civ1'
-        var={'X','Y','Z','U','V','W','C','F','FF';...
-            'Civ1_X','Civ1_Y','Civ1_Z','Civ1_U','Civ1_V','Civ1_W','Civ1_C','Civ1_F','Civ1_FF'};
-        role={'coord_x','coord_y','coord_z','vector_x','vector_y','vector_z','ancillary','warnflag','errorflag'};
-    %    units={'pixel','pixel','pixel','pixel','pixel','pixel','','',''};
-    case 'filter1'
-        var={'X','Y','Z','U','V','W','C','F','FF','Coord_tps','U_tps','V_tps','W_tps','SubRange','NbCentre','NbCentre','NbCentre';...
-            'Civ1_X','Civ1_Y','Civ1_Z','Civ1_U_smooth','Civ1_V_smooth','Civ1_W','Civ1_C','Civ1_F','Civ1_FF',...
+    case{'civ1','civ2','civ3'}
+        varout={'X','Y','Z','U','V','W','C','F','FF'};
+        varin= {'Civ1_X','Civ1_Y','Civ1_Z','Civ1_U','Civ1_V','Civ1_W','Civ1_C','Civ1_F','Civ1_FF'};
+         role={'coord_x','coord_y','coord_z','vector_x','vector_y','vector_z','ancillary','warnflag','errorflag'};  
+    case{'filter1','filter2','filter3'}  
+        varout={'X','Y','Z','U','V','W','C','F','FF','Coord_tps','U_tps','V_tps','W_tps','SubRange','NbCentre','NbCentre','NbCentre'};
+        varin={'Civ1_X','Civ1_Y','Civ1_Z','Civ1_U_smooth','Civ1_V_smooth','Civ1_W','Civ1_C','Civ1_F','Civ1_FF',...
             'Civ1_Coord_tps','Civ1_U_tps','Civ1_V_tps','Civ1_W_tps','Civ1_SubRange','Civ1_NbCentre','Civ1_NbCentres','Civ1_NbSites'};
         role={'coord_x','coord_y','coord_z','vector_x','vector_y','vector_z','ancillary','warnflag','errorflag','coord_tps','vector_x_tps',...
             'vector_y_tps','vector_z_tps','ancillary','ancillary','ancillary','ancillary'};
-     %  rmq: NbCentres and NbSites obsolete replaced by NbCentre, kept for consistency with previous data
-    case 'civ2'
-        var={'X','Y','Z','U','V','W','C','F','FF';...
-            'Civ2_X','Civ2_Y','Civ2_Z','Civ2_U','Civ2_V','Civ2_W','Civ2_C','Civ2_F','Civ2_FF'};
-        role={'coord_x','coord_y','coord_z','vector_x','vector_y','vector_z','ancillary','warnflag','errorflag'};
-    case 'filter2'
-        var={'X','Y','Z','U','V','W','C','F','FF','Coord_tps','U_tps','V_tps','W_tps','SubRange','NbCentre','NbCentre','NbCentre';...
-            'Civ2_X','Civ2_Y','Civ2_Z','Civ2_U_smooth','Civ2_V_smooth','Civ2_W','Civ2_C','Civ2_F','Civ2_FF',...
-            'Civ2_Coord_tps','Civ2_U_tps','Civ2_V_tps','','Civ2_SubRange','Civ2_NbCentre','Civ2_NbCentres','Civ2_NbSites'};
-        role={'coord_x','coord_y','coord_z','vector_x','vector_y','vector_z','ancillary','warnflag','errorflag','coord_tps','vector_x_tps',...
-            'vector_y_tps','vector_z_tps','ancillary','ancillary','ancillary','ancillary'};
-end
+          %  rmq: NbCentres and NbSites obsolete replaced by NbCentre, kept for consistency with previous data
+end
+switch vel_type
+    case {'civ2','filter2'}
+        varin=regexprep(varin,'1','2');
+    case {'civ3','filter3'} 
+        varin=regexprep(varin,'1','3');
+end
+var=[varout;varin];
 if ~strcmp(ProjModeRequest,'interp_tps')
     var=var(:,1:9);%suppress tps if not needed

trunk/src/uvmat.m

@@ -4989 +4989 @@
         end
     case {'civdata','pivdata_fluidimage'}
-        menu={'civ1';'filter1';'civ2';'filter2'};
-        if isequal(Civ,0)
-            imax=0;
-        elseif isequal(Civ,1) || isequal(Civ,2)
-            imax=1;
-        elseif isequal(Civ,3)
-            imax=2;
-        elseif isequal(Civ,4) || isequal(Civ,5)
-            imax=3;
-        elseif Civ==6 %patch2
-            imax=4;
-        else
-            imax=4;imin=3;
-        end
+        menu={'civ1';'filter1';'civ2';'filter2';'civ3';'filter3'};
+        imax=[0 1 1 2 3 3 4 5 5 6];
+        imax=imax(Civ+1);
+%         if isequal(Civ,0)
+%             imax=0;
+%         elseif isequal(Civ,1) || isequal(Civ,2)
+%             imax=1;
+%         elseif isequal(Civ,3)
+%             imax=2;
+%         elseif isequal(Civ,4) || isequal(Civ,5)
+%             imax=3;
+%         elseif Civ==6 %patch2
+%             imax=4;
+%         else
+%             imax=4;imin=3;
+%         end
 end
 menu=menu(imin:imax);