DIAMDD: adapted to SIAM1.x data model