I was totally ticked at the way it happened. Like, why didn't he just run out, didn't even have to shut the door, both could've jumped in the moon pool or whatever and swam to the surface. Only thing that makes sense is that Charlie must've made a split second decision that he had to drown in order for Claire to be rescued. Sure going to miss him.