Changeset 225

Timestamp:

Mar 20, 2011, 3:27:44 PM (14 years ago)

Author:

sommeria

Message:

civ : bug in binary check repaired. Introduction of the option PIVlab for PIV (still under test)

Location:

trunk/src

Files:

• civ.fig (modified) (previous)
• civ.m (modified) (12 diffs)
• mouse_motion.m (modified) (1 diff)
• pivlab.m (added)
• test_netcdf.m (modified) (1 diff)

trunk/src/civ.m

@@ -1565 +1565 @@
 
 % start status callback to visualise results
-if isfield(handles,'status')
-set(handles.status,'Value',1);%suppress status display
-status_Callback(hObject, eventdata, handles)
+if isfield(handles,'status') && ~isequal(get(handles.CivAll,'Value'),3)
+    set(handles.status,'Value',1);%suppress status display
+    status_Callback(hObject, eventdata, handles)
 end
 
@@ -1654 +1654 @@
 nbslice=numel(num_a_civ1);
 
-%% choice of batch priority
-ind_answer=2;
+
+%% read names of the .exe files for PIV and patch
+path_UVMAT=fileparts(which('uvmat')); %path to the source directory of uvmat
+xmlfile='PARAM.xml';
+if exist(xmlfile,'file')% search parameter xml file in the whole matlab path
+    t=xmltree(xmlfile);
+    s=convert(t);
+end
+test_interp=0;
 if batch
+    if isfield(s,'BatchParam')
+        sparam=s.BatchParam;
+        if ~ismember(sparam.BatchMode,{'sge'})
+            msgbox_uvmat('ERROR',['batch mode ' sparam.BatchMode ' not supported by UVMAT'])
+        end
+    else
+        msgbox_uvmat('ERROR','no batch civ binaries defined in PARAM.xml')
+        return
+    end
+    if isfield(sparam,'BatchMode')
+        batch_mode=sparam.BatchMode;
+    end
+    % choice of batch priority:
+    ind_answer=2;
     [s,w]=unix('qstat -q civ.q|grep job_| wc -l'); %check the waiting list (command unix)
     if isequal(s,0)
@@ -1669 +1690 @@
         end
     else
-        msgbox_uvmat('ERROR','batch system not available')
-        return
-    end
-% else
-%     if isunix
-%         [xx,w]=unix('ps faux |grep civ|wc -l');
-%         w(end)=[];
-%         if str2double(w)+numel(num1_civ1)> 50
-%             msgbox_uvmat('ERROR',{['There are already ' w ' civ processes running locally'];'Use BATCH or submit RUN later'})
-%             return
-%         end
-%     end
-end
-
-
-%% read names of the .exe files for PIV and patch
-path_UVMAT=fileparts(which('uvmat')); %path to the source directory of uvmat
-xmlfile='PARAM.xml';
-if exist(xmlfile,'file')% search parameter xml file in the whole matlab path
-    t=xmltree(xmlfile);
-    s=convert(t);
-end
-test_interp=0;
-if batch
-    if isfield(s,'BatchParam')
-        sparam=s.BatchParam;
-        if ~ismember(sparam.BatchMode,{'sge'})
-            msgbox_uvmat('ERROR',['batch mode ' sparam.BatchMode ' not supported by UVMAT'])
-        end
-    else
-        msgbox_uvmat('ERROR','no batch mode defined in PARAM.xml')
+        msgbox_uvmat('ERROR','sge batch system not available')
         return
     end
@@ -1706 +1697 @@
         sparam=s.RunParam;
     else
-        msgbox_uvmat('ERROR','no civ binaries defined in PARAM.xml')
+        msgbox_uvmat('ERROR','no run civ binaries defined in PARAM.xml')
         return
     end
-    if isfield(sparam,'CivBin')
-        if ~exist(sparam.CivBin,'file')||~isequal(which(sparam.CivBin),sparam.CivBin)% if path defined as relative to uvmat
-            CivBin=sparam.CivBin;
-            sparam.CivBin=fullfile(path_UVMAT,sparam.CivBin);
-            if ~exist(sparam.CivBin,'file')
-                 msgbox_uvmat('ERROR',['CIVx binary ' CivBin ' defined in PARAM.xm does not exist'])
-                 return
-            end
-        end
-    end
-    if isfield(sparam,'Civ1Bin')
-        if ~exist(sparam.Civ1Bin,'file')||~isequal(which(sparam.Civ1Bin),sparam.Civ1Bin)% if path defined as relative to uvmat
-%             CivBin=sparam.Civ1Bin;
-            sparam.Civ1Bin=fullfile(path_UVMAT,sparam.Civ1Bin);
-            if ~exist(sparam.Civ1Bin,'file')
-                 msgbox_uvmat('ERROR',['civ1 binary ' sparam.Civ1Bin ' defined in PARAM.xm does not exist'])
-                 return
-            end
-        end
-    end
-    if isfield(sparam,'Civ2Bin')
-%         CivBin=sparam.Civ2Bin;
-        if ~exist(sparam.Civ2Bin,'file')||~isequal(which(sparam.Civ2Bin),sparam.Civ2Bin)% if path defined as relative to uvmat
-            sparam.Civ2Bin=fullfile(path_UVMAT,sparam.Civ2Bin);
-            if ~exist(sparam.Civ2Bin,'file')
-                 msgbox_uvmat('ERROR',['civ2 binary ' sparam.Civ2Bin ' defined in PARAM.xm does not exist'])
-                 return
-            end
-        end
-    end
-    if  isfield(sparam,'PatchBin')
-        if ~exist(sparam.PatchBin,'file')||~isequal(which(sparam.PatchBin),sparam.PatchBin)% if path defined as relative to uvmat
-            sparam.PatchBin=fullfile(path_UVMAT,sparam.PatchBin);
-        end
-    end
-    if isfield(sparam,'FixBin')
-        if ~exist(sparam.FixBin,'file')||~isequal(which(sparam.FixBin),sparam.FixBin)% if path defined as relative to uvmat
-            sparam.FixBin=fullfile(path_UVMAT,sparam.FixBin);
-        end
-    end
-end
-if batch
-    if isfield(sparam,'BatchMode')
-        batch_mode=sparam.BatchMode;
-    end
-end
+end
+civAll=isequal(get(handles.CivAll,'Value'),2); % Boolean for new civ programs
+if civAll && isfield(sparam,'CivBin')
+    CivBin=sparam.CivBin;
+    if ~exist(CivBin,'file') || ~isempty(which(CivBin))% if path defined as relative to uvmat 
+        sparam.CivBin=fullfile(path_UVMAT,CivBin);
+        if ~exist(sparam.CivBin,'file')
+             msgbox_uvmat('ERROR',['CIVx binary ' CivBin ' defined in PARAM.xm does not exist'])
+             return
+        end
+    end
+end
+if isfield(sparam,'Civ1Bin')
+    Civ1Bin=sparam.Civ1Bin;
+    which(Civ1Bin)
+    if ~exist(Civ1Bin,'file')||~isempty(which(Civ1Bin))% if path defined as relative to uvmat
+        sparam.Civ1Bin=fullfile(path_UVMAT,Civ1Bin);
+        if ~exist(sparam.Civ1Bin,'file')
+             msgbox_uvmat('ERROR',['civ1 binary ' Civ1Bin ' defined in PARAM.xm does not exist'])
+             return
+        end
+    end
+end
+if isfield(sparam,'Civ2Bin')
+    Civ2Bin=sparam.Civ2Bin;
+    if ~exist(Civ2Bin,'file')||~isempty(which(Civ2Bin))% if path defined as relative to uvmat      
+        sparam.Civ2Bin=fullfile(path_UVMAT,Civ2Bin);
+        if ~exist(sparam.Civ2Bin,'file')
+             msgbox_uvmat('ERROR',['civ2 binary ' Civ2Bin ' defined in PARAM.xm does not exist'])
+             return
+        end
+    end
+end
+if  isfield(sparam,'PatchBin')
+    if ~exist(sparam.PatchBin,'file')||~isempty(which(sparam.PatchBin))% if path defined as relative to uvmat
+        sparam.PatchBin=fullfile(path_UVMAT,sparam.PatchBin);
+    end
+end
+if isfield(sparam,'FixBin')
+    if ~exist(sparam.FixBin,'file')||~isempty(which(sparam.FixBin))% if path defined as relative to uvmat
+        sparam.FixBin=fullfile(path_UVMAT,sparam.FixBin);
+    end
+end
+
 
 
@@ -1857 +1846 @@
 %% MAIN LOOP
 time=get(handles.RootName,'UserData'); %get the set of times
-civAll=get(handles.CivAll,'Value'); % Boolean for new civ excution method
 super_cmd=[];
 
@@ -2232 +2220 @@
         if isequal(civAll,1)
             save(civAllxml,[flname '.xml']);
-            'TEST'
-            cmd=[cmd sparam.CivBin ' -f ' flname '.xml '  civAllCmd ' >' flname '.log' '\n']
-            'fincmd'
+            cmd=[cmd sparam.CivBin ' -f ' flname '.xml '  civAllCmd ' >' flname '.log' '\n'];
         end
         % create the .bat file:
@@ -2251 +2237 @@
                     eval(  ['!qsub -p ' pvalue ' -q civ.q -e ' flname '.errors -o ' flname '.log' ' ' filename_bat]);
             end
-        else
+        elseif ~isequal(get(handles.CivAll,'Value'),3)
             %% to lauch the jobs locally :
             if(isunix)
@@ -2260 +2246 @@
             super_cmd=[super_cmd cmd_str '\n'];         
             disp(cmd_str);
-        end
-    end
-end
-
-if ~batch
+        else       %run PIVlab if selected
+            image1=imread(par_civ1.filename_ima_a);
+            image2=imread(par_civ1.filename_ima_b);         
+               [xtable ytable utable vtable ctable typevector] = pivlab (image1,image2,str2num(par_civ1.ibx), str2num(par_civ1.dx), 1, [], []); 
+               Data.ListGlobalAttribute={'title','Time','Dt'};
+               Data.title='PIVlab';
+               Data.Time=str2double(par_civ1.T0);
+               Data.Dt=str2double(par_civ1.Dt);
+               Data.ListVarName={'X','Y','U','V','C','FF'};%  cell array containing the names of the fields to record
+               Data.VarDimName={'nbvec','nbvec','nbvec','nbvec','nbvec','nbvec'};
+                Data.VarAttribute{1}.Role='coord_x';
+            Data.VarAttribute{2}.Role='coord_y';
+            Data.VarAttribute{3}.Role='vector_x';
+            Data.VarAttribute{4}.Role='vector_y';
+            Data.VarAttribute{5}.Role='errorflag';
+            Data.X=reshape(xtable,[],1);
+            Data.Y=reshape(ytable,[],1);
+            Data.U=reshape(utable,[],1);
+            Data.V=reshape(vtable,[],1);
+            Data.C=reshape(ctable,[],1);
+            Data.FF=reshape(~typevector,[],1);
+            errormsg=struct2nc(filecell.nc.civ1{ifile,j},Data);
+            if isempty(errormsg)
+                display([filecell.nc.civ1{ifile,j} ' written'])
+            else
+                msgbox_uvmat('ERROR',errormsg)
+            end
+        end                  
+    end
+end
+
+if ~batch && ~isequal(get(handles.CivAll,'Value'),3)
     [Rootbat,Filebat,extbat]=fileparts(filename_bat);
     filename_superbat=fullfile(Rootbat,['job_list.bat']);
@@ -2274 +2287 @@
      end
      system([filename_superbat ' &'])% execute main commmand
-%     else
-%         eval(['!' filename_superbat ' &']);
-%     end
 end
 
@@ -3730 +3740 @@
 set(handles.rho_patch1,'Visible','on')
 set(handles.rho_text1,'Visible','on')
-if get(handles.CivAll,'Value')
+if get(handles.CivAll,'Value')==2
     set(handles.thresh_patch1,'Visible','on')
     set(handles.thresh_text1,'Visible','on')
@@ -4581 +4591 @@
 
 %------------------------------------------------------------------------
-% --- Executes on button press in TestCiv1.
+% --- Executes on button press in TestCiv1: display image correlation function
 function TestCiv1_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
@@ -4773 +4783 @@
 % --- Executes on button press in CivAll.
 function CivAll_Callback(hObject, eventdata, handles)
-if get(handles.CivAll,'Value')
+if get(handles.CivAll,'Value')==2
     if get(handles.PATCH1,'Value')
         set(handles.thresh_patch1,'Visible','on')

trunk/src/mouse_motion.m

@@ -241 +241 @@
                         Asub=reshape(Asub,[],1);%first sub-image reshaped as matlab vector
                         rangx(1)=-(isx2-ibx2)+shiftx;
-                        rangx(2)=isx2-ibx2+shiftx
+                        rangx(2)=isx2-ibx2+shiftx;
                         rangy(1)=-(isy2-iby2)-shifty;
                         rangy(2)=(isy2-iby2)-shifty

trunk/src/test_netcdf.m

@@ -29 +29 @@
 Data.VarAttribute{6}.longname='interpolated ordinate';
 Data.VarAttribute{7}.longname='stream function';
+Data.VarAttribute{1}.Role='coord_x';
+Data.VarAttribute{2}.Role='coord_y';
+Data.VarAttribute{3}.Role='vector_x';
+Data.VarAttribute{4}.Role='vector_y';
 
 nbvec=200;