modified to use new mca parameters

This commit was SVN r1531.

src/tools/mpirun/mpiboot

@@ -17,10 +17,9 @@
 # Some basic defaults
 #
 ######################################################################
-ompi_cellid=""
-ompi_jobid=""
 ompi_procid=""
 ompi_numprocs=""
+ompi_jobid=""
 ompi_commdir=""
 
 ######################################################################
@@ -40,6 +39,11 @@ for i ; do
             ompi_cellid="${1}"
             shift
             ;;
+        -jobid)
+            shift
+            ompi_jobid="${1}"
+            shift
+            ;;
         -procid)
             shift
             ompi_procid="${1}"
@@ -50,11 +54,6 @@ for i ; do
             ompi_numprocs="${1}"
             shift
             ;;
-        -jobid)
-            shift
-            ompi_jobid="${1}"
-            shift
-            ;;
         -commdir)
             shift
             ompi_commdir="${1}"
@@ -85,7 +84,7 @@ if test "${args_err}" != "0" ; then
     exit 1
 fi
 if test -z "${1}" ; then
-    echo "Did not find app to execute"
+    echo "Did not find app to execute: " ${1}
     exit 2
 fi
 
@@ -99,7 +98,7 @@ export OMPI_MCA_pcm_cofs_jobid="${ompi_jobid}"
 export OMPI_MCA_pcm_cofs_procid="${ompi_procid}"
 export OMPI_MCA_pcm_cofs_num_procs="${ompi_numprocs}"
 if test ! -z "${ompi_commdir}"; then
-    export MCA_common_ompi_cofs_comm_dir="${ompi_commdir}"
+    export OMPI_MCA_oob_cofs_dir="${ompi_commdir}"
 fi
 
 ######################################################################

src/tools/mpirun/mpirun

@@ -26,7 +26,7 @@ ompi_debug=0
 #
 ######################################################################
 ompi_hostfile=""
-ompi_jobid=""
+ompi_jobhandle=""
 ompi_app_args=""
 ompi_mydir=""
 ompi_cwd="`pwd`"
@@ -154,8 +154,8 @@ do_start_proc() {
     local cmd=""
 
     cmd="ssh ${rmt_hostname} -f -n ${rmt_boot} "
-    cmd="${cmd} -myvpid ${rmt_vpid}"
-    cmd="${cmd} -numprocs ${ompi_numprocs} -cellid 1 -jobid ${ompi_jobid}"
+    cmd="${cmd} -cellid 1 -jobid ${ompi_jobid} -procid ${rmt_vpid}"
+    cmd="${cmd} -numprocs ${ompi_numprocs}"
     cmd="${cmd} -pwd ${ompi_cwd} ${ompi_prepped}"
     if test ! -z "${MCA_common_ompi_cofs_comm_dir}" ; then
         cmd="${cmd} -commdir ${MCA_common_ompi_cofs_comm_dir}"
@@ -244,9 +244,5 @@ make_hosts_list
 
 launch_procs "${ompi_app_args}"
 
-echo ""
-echo "Processes should be running.  I'm going to exit now.  Need to add sleeping"
-echo ""
-
 exit 0