Changeset 1003 for trunk/src


Ignore:
Timestamp:
Mar 28, 2017, 10:12:08 AM (4 years ago)
Author:
campagne8a
Message:

Fluidiamage compatibility

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/read_pivdata_fluidimage.m

    r987 r1003  
    151151        Field.V(isnan(Field.V)) = 0;
    152152    case {'filter1','filter2',''}
    153         Field.X= double(Data.ixvecs_grid);
    154         Field.Y= double(Data.iyvecs_grid);
    155         Field.U= double(Data.deltaxs_approx);
     153        Field.X= double(Data.ixvecs_final);
     154        Field.Y= double(Data.iyvecs_final);
     155        Field.U= double(Data.deltaxs_final);
    156156        Field.U(isnan(Field.U)) = 0;
    157         Field.V= double(Data.deltays_approx);
     157        Field.V= double(Data.deltays_final);
    158158        Field.V(isnan(Field.V)) = 0;
    159159end
  • trunk/src/series.m

    r1001 r1003  
    153153[path_series,name,ext]=fileparts(which('series')); % path to the GUI series
    154154path_series_fct=fullfile(path_series,'series'); % path of the functions in subdirectroy 'series'
    155 [code, message] = system...
    156     ('LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | pyp "p.split('':'') |... [s for s in p if ''matlab'' not in s] | '':''.join(p)") python -c "import fluidimage"');
     155command = ['LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | pyp "l = x.split('':''); l = [s for s in l if ''matlab'' not in s]; print('':''.join(l))") ' ...
     156            'python -c "import fluidimage" ' ];
     157[code, ~] = system(command);
    157158if code==0
    158159    ActionExtList={'.m';'.sh';'.py (in dev.)'}; % default choice of extensions (Matlab fct .m or compiled version .sh
     
    21592160        msgbox_uvmat('CONFIRMATION',[num2str(currJobIndex-1) ' jobs launched on queue ' qstat_Queue '.'])
    21602161    case 'python'
    2161         command = [
    2162             'LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | pyp "p.split('':'') | [s for s in p if ''matlab'' not in s] | '':''.join(p)") ' ...
     2162        command = ['LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | pyp "l = x.split('':''); l = [s for s in l if ''matlab'' not in s]; print('':''.join(l))") ' ...
    21632163            'python -m fluidimage.run_from_xml ' filexml{iprocess}];
    21642164        % fprintf(['command:\n' command '\n\n'])
Note: See TracChangeset for help on using the changeset viewer.