Changeset 1138


Ignore:
Timestamp:
Apr 25, 2024, 3:00:36 PM (6 months ago)
Author:
augier3pi
Message:

For Fluidimage launching

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/call_command_clean.m

    r1136 r1138  
    88clean_ld_lib_path = strjoin(new_paths, ':');
    99
    10 [status, result] = system(['LD_LIBRARY_PATH=' clean_ld_lib_path ' ' command], '-echo');
     10[status, result] = system(['OMP_NUM_THREADS=1 LD_LIBRARY_PATH=' clean_ld_lib_path ' ' command], '-echo');
    1111end
  • trunk/src/series.m

    r1136 r1138  
    160160% % [code, ~] = system(command);
    161161% % if code==0
    162     ActionExtList={'.m';'.sh';'.py (in dev.)'}; % default choice of extensions (Matlab fct .m or compiled version .sh
     162    ActionExtList={'.m';'.sh';'fluidimage'}; % default choice of extensions (Matlab fct .m or compiled version .sh
    163163% % else
    164164% %     ActionExtList={'.m';'.sh'};  % python options not installed
     
    14921492ActionExt='.m'; % default
    14931493if isfield(Param.Action,'ActionExt')
    1494     ActionExt=Param.Action.ActionExt; % '.m', '.sh' (compiled)  or '.py' (Python)
     1494    ActionExt=Param.Action.ActionExt; % '.m', '.sh' (compiled)  or 'fluidimage' (Python)
    14951495    Param.Action=rmfield(Param.Action,'ActionExt'); % remove from the recorded xml file to avoid interference during ImportConfig
    14961496end
     
    19381938
    19391939    %% case of a function in Python
    1940     if strcmp(ActionExt, '.py (in dev.)')
     1940    if strcmp(ActionExt, 'fluidimage')
    19411941        fprintf([
    19421942            '\n' ...
    19431943            '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n' ...
    1944             'The option .py is used. It is still in development.\n' ...
    1945             'To try it, first install pyper and the most recent version of fluidimage\n' ...
    1946             '(see https://bitbucket.org/fluiddyn/fluidimage).\n' ...
    1947             'Warning: there is no direct correspondance between UVMAT and fluidimage parameters\n' ...
     1944            'The computation should be done by fluidimage (https://fluidimage.readthedocs.io).\n' ...
     1945            'Warning: Fluidimage parameters will be guessed from UVmat parameters but \n' ...
     1946            'there is no direct correspondance between UVMAT and fluidimage parameters.\n' ...
     1947            'Please report issues here https://foss.heptapod.net/fluiddyn/fluidimage/-/issues\n' ...
    19481948            '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n'])
    19491949        RunMode = 'python';
     
    37213721ActionExtList=get(handles.ActionExt,'String');
    37223722ActionExt=ActionExtList{get(handles.ActionExt,'Value')};
    3723 if strcmp(ActionExt,'.py (in dev.)')
     3723if strcmp(ActionExt,'fluidimage')
    37243724    set(handles.RunMode,'Value',2)
    37253725end
Note: See TracChangeset for help on using the changeset viewer.