New shoplifted version (updated to thin@57ea74406)

README.md

@@ -1,7 +1,7 @@
 ![SOMBRERO](sombrero.png)
 
 * [HiRep version: 6c436a2](https://github.com/sa2c/HiRep/tree/6c436a2)
-* [SOMBRERO base version: a544c84](https://github.com/sa2c/SOMBRERO/tree/a544c84)
+* [SOMBRERO base version: 57ea744](https://github.com/sa2c/SOMBRERO/tree/57ea744)
 * [shoplifter version: 7aaec76](https://github.com/sa2c/shoplifter/tree/7aaec76)
 
 A benchmarking utility for high performance computing based on lattice field theory applications.

sombrero.sh

@@ -70,10 +70,14 @@ safe_run mpirun $nodes sombrero/sombrero5 $weak $size $partition -v result | tee
 safe_run mpirun $nodes sombrero/sombrero6 $weak $size $partition -v result | tee -a $tmpfile 
 
 # Calculate the sums of the timings and the flop counts
-time=$(grep RESULT $tmpfile | grep -v "Gflops/seconds" | awk '{s+=$7} END {print s}') 
-Gflops=$(grep RESULT $tmpfile | grep -v "Gflops/seconds" | awk '{s+=$4} END {print s}') 
-echo [RESULT] SUM $Gflops Gflops in $time seconds &&
-echo [RESULT] SUM $(echo $Gflops/$time | bc ) Gflops/seconds
+grep RESULT $tmpfile | grep -v "Gflops/seconds" | \
+    awk '{
+      time+=$7; 
+      Gflops+=$4;}
+      END { 
+      printf("[RESULT] SUM %.2f Gflops in %.2f seconds\n", Gflops, time);
+      printf("[RESULT] SUM %.2f Gflops/seconds\n", Gflops/ time);
+  }'
 
 
 

sombrero/sombrero.c

@@ -353,7 +353,7 @@ int main(int argc, char *argv[]) {
 
   /* output version information */
   lprintf("MAIN", 0, "SOMBRERO built from HiRep commit 6c436a2\n");
-  lprintf("MAIN", 0, "Base SOMBRERO commit a544c84\n");
+  lprintf("MAIN", 0, "Base SOMBRERO commit 57ea744\n");
   lprintf("MAIN", 0,
           "SOMBRERO built using shoplifter commit 7aaec76\n");