XMI-MSIM support restored after Bruno's changed to Save routine

Also encapsulated openmp pragmas in _OPENMP ifdefs in order to avoid
compiler warnings