Changeset 426 for trunk/src/civ.m

Timestamp:

May 17, 2012, 10:58:49 AM (12 years ago)

Author:

sommeria

Message:

compiled matlab civ introduced in Batch mode,
minor bugs fixed for histogram of velocity

File:

• trunk/src/civ.m (modified) (2 diffs)

trunk/src/civ.m

@@ -1177 +1177 @@
     case 'Matlab'
         if batch
+            binary_list={'CivmBin'};
             % verifier MenuMatlab installe sur le cluster
             % difficile a faire a priori
@@ -1607 +1608 @@
                             return
                         end
-                        text_matlabscript=[...
-                        '#!/bin/bash \n'...
-                        '. /etc/sysprofile \n'...
-                        'matlab -nodisplay -nosplash -nojvm <<END_MATLAB \n'...
-                        'cd(''' path_civ '''); \n'...
-                        'civ_matlab(''' filename_xml ''',''' OutputFile '.nc''); \n'...
-                        'exit \n'...
-                        'END_MATLAB \n'];
-                        fprintf(fid,text_matlabscript);
+%                         text_matlabscript=[...
+%                         '#!/bin/bash \n'...
+%                         '. /etc/sysprofile \n'...
+%                         'matlab -nodisplay -nosplash -nojvm <<END_MATLAB \n'...
+%                         'cd(''' path_civ '''); \n'...
+%                         'civ_matlab(''' filename_xml ''',''' OutputFile '.nc''); \n'...
+%                         'exit \n'...
+%                         'END_MATLAB \n'];
+                        cmd=['#!/bin/bash \n '...
+                        '#$ -cwd \n '...
+                        'hostname && date \n '...
+                        'umask 002 \n'...
+                         Param.xml.CivmBin ' ' Param.xml.RunTime ' ' filename_xml ' ' OutputFile '.nc'];%allow writting access to created files for user group
+                    
+                        fprintf(fid,cmd);
                         fclose(fid);
                         if isunix