Changeset 1004 for trunk/src

Timestamp:

Mar 28, 2017, 4:06:17 PM (8 years ago)

Author:

augier3pi

Message:

fluidimage compatibility.

File:

• trunk/src/series.m (modified) (3 diffs)

trunk/src/series.m

@@ -154 +154 @@
 path_series_fct=fullfile(path_series,'series'); % path of the functions in subdirectroy 'series'
 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))") ' ...
-            'python -c "import fluidimage" ' ];
+            'python -c "import fluidimage"'];
 [code, ~] = system(command); 
 if code==0
@@ -1791 +1791 @@
         '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n' ...
         'The option .py is used. It is still in development.\n' ...
-        'Do not use it unless you really know what you do!\n' ...
-        'To try it, first install Pyp and the most recent version of FluidImage.\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' ...
         '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n'])
     RunMode = 'python';
@@ -2162 +2163 @@
         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))") ' ...
             'python -m fluidimage.run_from_xml ' filexml{iprocess}];
-        % fprintf(['command:\n' command '\n\n'])
+        fprintf(['command:\n' command '\n\n'])
         system(command, '-echo');
 end