Update scaling script

This commit was SVN r26510.

contrib/scaling/scaling.pl

@@ -40,28 +40,37 @@ my $n = 1;
 my $cmd;
 
 my $test;
+my $output;
+my @results;
+print "\n--------------------------------------------------\n";
 foreach $test (@tests) {
     if (-e $test) {
+        # pre-position the executable
+        $cmd = "mpirun -npernode 1 $test 2>&1";
+        system($cmd);
         $n = 1;
         while ($n <= $num_nodes) {
-            $cmd = "time mpirun -npernode 1 -max-vm-size " . $n . " $test";
+            $cmd = "time mpirun -npernode 1 -max-vm-size " . $n . " $test 2>&1";
             print $cmd . "\n";
             if (0 == $showme_arg) {
-                system $cmd;
-                print "\n";
+                $output = `$cmd`;
+                $output =~ s/(.+)\n.*/$1/;
+                @results = split(/\s+/,$output);
+                print $results[0] . "    " . $results[1] . "    " . $results[2] . "\n\n";
             }
             $n = 2 * $n;
         }
         if ($n != (2 * $num_nodes)) {
-            $cmd = "time mpirun -npernode 1 $test";
-            if (1 == $showme_arg) {
-                print $cmd . "\n";
-            } else {
-                system $cmd;
-                print "\n";
+            $cmd = "time mpirun -npernode 1 $test 2>&1";
+            print $cmd . "\n";
+            if (0 == $showme_arg) {
+                $output = `$cmd`;
+                $output =~ s/(.+)\n.*/$1/;
+                @results = split(/\s+/,$output);
+                print $results[0] . "    " . $results[1] . "    " . $results[2] . "\n\n";
             }
         }
-        print "\n\n";
+        print "\n--------------------------------------------------\n";
     } else {
         print "Test " . $test . " was not found - test skipped\n\n";
     }