Assimilation of both column- and layer-integrated dust opacity observations in the Martian atmosphere