Cleanup of MPI+OpenMP
Testing MPI again