Changeset 1138 for trunk

Timestamp:

Apr 25, 2024, 3:00:36 PM (8 months ago)

Author:

augier3pi

Message:

For Fluidimage launching

Location:

trunk/src

Files:

• call_command_clean.m (modified) (1 diff)
• series.m (modified) (4 diffs)

trunk/src/call_command_clean.m

@@ -8 +8 @@
 clean_ld_lib_path = strjoin(new_paths, ':');
 
-[status, result] = system(['LD_LIBRARY_PATH=' clean_ld_lib_path ' ' command], '-echo');
+[status, result] = system(['OMP_NUM_THREADS=1 LD_LIBRARY_PATH=' clean_ld_lib_path ' ' command], '-echo');
 end

trunk/src/series.m

@@ -160 +160 @@
 % % [code, ~] = system(command);
 % % if code==0
-    ActionExtList={'.m';'.sh';'.py (in dev.)'}; % default choice of extensions (Matlab fct .m or compiled version .sh
+    ActionExtList={'.m';'.sh';'fluidimage'}; % default choice of extensions (Matlab fct .m or compiled version .sh
 % % else
 % %     ActionExtList={'.m';'.sh'};  % python options not installed
@@ -1492 +1492 @@
 ActionExt='.m'; % default
 if isfield(Param.Action,'ActionExt')
-    ActionExt=Param.Action.ActionExt; % '.m', '.sh' (compiled)  or '.py' (Python)
+    ActionExt=Param.Action.ActionExt; % '.m', '.sh' (compiled)  or 'fluidimage' (Python)
     Param.Action=rmfield(Param.Action,'ActionExt'); % remove from the recorded xml file to avoid interference during ImportConfig
 end
@@ -1938 +1938 @@
 
     %% case of a function in Python
-    if strcmp(ActionExt, '.py (in dev.)')
+    if strcmp(ActionExt, 'fluidimage')
         fprintf([
             '\n' ...
             '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n' ...
-            'The option .py is used. It is still in development.\n' ...
-            'To try it, first install pyper and the most recent version of fluidimage\n' ...
-            '(see https://bitbucket.org/fluiddyn/fluidimage).\n' ...
-            'Warning: there is no direct correspondance between UVMAT and fluidimage parameters\n' ...
+            'The computation should be done by fluidimage (https://fluidimage.readthedocs.io).\n' ...
+            'Warning: Fluidimage parameters will be guessed from UVmat parameters but \n' ...
+            'there is no direct correspondance between UVMAT and fluidimage parameters.\n' ...
+            'Please report issues here https://foss.heptapod.net/fluiddyn/fluidimage/-/issues\n' ...
             '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n'])
         RunMode = 'python';
@@ -3721 +3721 @@
 ActionExtList=get(handles.ActionExt,'String');
 ActionExt=ActionExtList{get(handles.ActionExt,'Value')};
-if strcmp(ActionExt,'.py (in dev.)')
+if strcmp(ActionExt,'fluidimage')
     set(handles.RunMode,'Value',2)
 end