All the calculation schemes work.

Added the combined MPI/OpenMP from Erlend.