MESOSCALE: corrected the diagfi bug. updated test case and check those are still working OK. other changes are cosmetic