Changeset 310 for trunk

Timestamp:

Dec 1, 2011, 11:19:01 AM (13 years ago)

Author:

gostiaux

Message:

civ with mpilauncher included

File:

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

trunk/src/civ.m

@@ -1493 +1493 @@
                 display(oar_command);eval(oar_command);
                 end          
-       case 'oar' %oar-dispatch.pl
+       case 'oar_dispatch' %oar-dispatch.pl
                 filename_joblist=fullfile(Rootbat,'job_list.txt');
                 fid=fopen(filename_joblist,'w');
@@ -1515 +1515 @@
                 display(oar_command);
                 eval(['! . ' filename_oarcommand])
-        case 'oar_mpi'
+        case 'oar'
                 filename_joblist=fullfile(Rootbat,'job_list.txt');
                 fid=fopen(filename_joblist,'w');
@@ -1541 +1541 @@
                     '# ========================================================= \n'...
                     '#   USER should only modify these 2 lines  \n'...
-                    'WORKDIR=/home/users/gostiaux/tmp/begou \n'...
-                    'COMMANDE="/home/users/gostiaux/tmp/begou/mpilauncher  -f ' filename_joblist '" \n'...
+                    'WORKDIR=' pwd ' \n'...
+                    'COMMANDE="mpilauncher  -f ' filename_joblist '" \n'...
                     '# ========================================================= \n'...
                     '# DO NOT MODIFY the FOLOWING LINES. (or be carefull) \n'...
@@ -1549 +1549 @@
                     'NCPUS=`cat $OAR_NODEFILE |wc -l` \n'...
                     '#========== Bidouille ============== \n'...
-                    'export OMPI_MCA_plm_rsh_agent=$HOME/tmp/begou/oarshmost \n'...
-                    'cd $WORKDIR \n'...
-                    'CMD="mpirun -np $NCPUS  -wdir $WORKDIR $MPINODES $COMMANDE" \n'...
+                    'export OMPI_MCA_plm_rsh_agent=oar-envsh \n'...%                     'cd $WORKDIR \n'...
+                    'CMD="mpirun -np $NCPUS -wdir $WORKDIR $MPINODES $COMMANDE" \n'...
                     'echo "I run: $CMD"  \n'...
                     '$CMD \n'...